| commit | 89df4b62475d555e9dbf6723a13ac7cbd184783d | [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 | a1572f1de821c237bae8ce8399901bf31330ff8e [diff] | |
| parent | b33190fc560a0793749dcb895f7ccc8f285020c8 [diff] |
resolve merge conflicts of e012de5 to stage-aosp-master am: 4ff7f9f62a Change-Id: I91b285de08f184efa8bdada92ff9aac9b73f7a8f