| commit | 56996ff61e4961880db1240f6a5d4f57a79512d9 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 00:40:25 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 00:40:25 2016 +0000 |
| tree | 9b10bb98aea8906b98c87f81bae51e2d68b55e9f | |
| parent | 494855abe8d8fa5d0d9c1fffd9f280843ab429f9 [diff] | |
| parent | ef57a0d629d9b3e6e13ec5144900b9cb6d8ca5ea [diff] |
resolve merge conflicts of 76ce8e5 to stage-aosp-master am: ed935c32f4 am: ef57a0d629 Change-Id: Ifcc24ad835f2e74a25954bf3fd7090c75abdc084