| commit | 2acf4a81dc0c4deef517f3fab8d33b3a5f3059ca | [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 | 729722b3ea68352c7d1f3d9f3594158aa3253d7e [diff] | |
| parent | 23a574a195ebe4f755a1f305952332ed18a1242f [diff] |
resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 Change-Id: Id3e18ffa3a9e40755bd65bfbab79f79a7f8373a0