| commit | c76aa692075acfef74349185d86062bbfec5a8c0 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 19:30:02 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 19:30:02 2016 +0000 |
| tree | c4a30e5a3dd3d1b6845c8471e17f041ccb0400ca | |
| parent | ef57a0d629d9b3e6e13ec5144900b9cb6d8ca5ea [diff] | |
| parent | b3d46b44a399ba0a9b14caac8603db15089ab55b [diff] |
resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3 Change-Id: I5123493e165c4d2ab74cf045e5fb8181886dce62