OSDN Git Service

Merge changes Ib496e818,I074204e9
authorColin Cross <ccross@android.com>
Wed, 26 Jun 2013 00:03:24 +0000 (00:03 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 26 Jun 2013 00:03:24 +0000 (00:03 +0000)
commitfbec57d46c42460b2381484d1610ff21922d162e
tree5aaecbeac880a8e5e96148858121dee63ddf5d58
parentb116bf76286178a7d552c4d0a72b79212c8c93d1
parent5e9a086145764d64c0f7fbce5489d820aa7fdcd4
Merge changes Ib496e818,I074204e9

* changes:
  bionic: add compatibility mode for properties
  bionic: use the size of the file to determine property area size