| commit | 7fb9c475f85c28df8eee0d7ce955946a315a2f8c | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Fri Jun 24 06:10:09 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 24 06:10:09 2016 +0000 |
| tree | 6aa2fda27fc596d89ede18fa3ede570dec8bec0c | |
| parent | 8913e9a67f7884fc18a65e761ab59390ebfe6bc4 [diff] | |
| parent | 05d2ce353938a2d764fc02619e9f6368158edd7f [diff] |
resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 Change-Id: Id3e18ffa3a9e40755bd65bfbab79f79a7f8373a0