| commit | ef57a0d629d9b3e6e13ec5144900b9cb6d8ca5ea | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 00:31:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 00:31:29 2016 +0000 |
| tree | 808ba605d02650a3ee329333edf9f7a218de20f6 | |
| parent | 84b61fb4b0142fb54d9c288f0e90c64028871d5f [diff] | |
| parent | ed935c32f478229220a90442da0af3c3d3fc6230 [diff] |
resolve merge conflicts of 76ce8e5 to stage-aosp-master am: ed935c32f4 Change-Id: Ibb7415686469d7b15e8dbe0cd04226c4e0cd7d76