| commit | a016ed1a357ef21c8ec7621f71c47556bebc1cf7 | [log] [tgz] |
|---|---|---|
| author | Chia-I Wu <olv@google.com> | Mon Nov 20 21:10:21 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 20 21:10:21 2017 +0000 |
| tree | cbb10a95213b9817c6a2fabbf712825bbc7e9ce6 | |
| parent | 8f258042f15a859b6100795fdc27703e4c2af39d [diff] | |
| parent | 8b7f97bb8f44e72ff9f922d272cec3b2b57c4ad0 [diff] |
resolve merge conflicts of 8a2135344 to stage-aosp-master am: 9225761c8d am: 8b7f97bb8f -s ours Change-Id: I21cfa2d8a40545ee67444abbc3bde35c43188b2b