commit | c3b5cffdb9f8f465a3cdb329fc71f74e1d9bcf2f | [log] [tgz] |
---|---|---|
author | Hung-ying Tyan <tyanh@google.com> | Wed Jun 14 06:28:12 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 14 06:28:12 2017 +0000 |
tree | 904e4633d5aa412d731e89b5591681748708f527 | |
parent | e53fcc59654ce784d269035a42e817b03e46b0d0 [diff] | |
parent | 6581b0c6859c9c21e53ccca42d8325d773b7ba3d [diff] |
Merge changes from topic 'move-default-prop-v2' into oc-dev am: c6b07ec095 -s ours am: e908e98895 am: 66af1dcfd4 Change-Id: I54d3bff11bfb2724340c17c20ef57f6ac62e8ee1