| commit | 84717d4118cff0790aecd8365029200e36a47bba | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 19:35:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 19:35:08 2016 +0000 |
| tree | 341d9323e8ab24bf4809d6dc6cacec723b8d9d2a | |
| parent | 2de53cbfae1dd609d6f9561eef8423c4ee811121 [diff] | |
| parent | c76aa692075acfef74349185d86062bbfec5a8c0 [diff] |
resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3 am: c76aa69207 Change-Id: I6bb066d131dde297612c5dcbf5051f4964e62a8b