| commit | c59b46d0c4fb8fbea4ed461709efdceaa4d27375 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Aug 05 05:48:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 05 05:48:17 2016 +0000 |
| tree | f08a99b1488838d417dc863675b47928c7232468 | |
| parent | 5038e298f23d8c3f187a59179e93da25112070ee [diff] | |
| parent | aef02526b593521678f6c671611571286214e3a4 [diff] |
resolve merge conflicts of e012de5 to stage-aosp-master am: 4ff7f9f62a am: aef02526b5 Change-Id: I6c07ac4d130aba1056f9cbd28d41c0b299832eeb