| commit | aef02526b593521678f6c671611571286214e3a4 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Aug 05 05:45:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 05 05:45:47 2016 +0000 |
| tree | e2f76c6aa8ec818eecb016c726ee2adb4d9d57ff | |
| parent | e29aa5d31ecf9490a0ec9224a98be0ded3fb60d2 [diff] | |
| parent | 4ff7f9f62ae5d283fb62ee87c615a801642cba8f [diff] |
resolve merge conflicts of e012de5 to stage-aosp-master am: 4ff7f9f62a Change-Id: I91b285de08f184efa8bdada92ff9aac9b73f7a8f