| commit | 67129879b38e680b93d0599ffe6d77191697b085 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Wed Oct 19 20:55:20 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 19 20:55:20 2016 +0000 |
| tree | 84320d40f302cae2965871020ee2c12af68b4c37 | |
| parent | e6f0bce2d075519350cd10ce3c663080d1104a61 [diff] | |
| parent | 449828160ad1d7519fba690b10fe6efa5af1b7c6 [diff] |
resolve merge conflicts of 9cd6f0c to stage-aosp-master am: 998e8e5c26 am: 449828160a -s ours Change-Id: I2557721bc7b296001736a0f51864ec0ad8723a70