| commit | 9f3c1a9dc35ddbb2973910294e95fa9cc4e4c185 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Mon May 02 18:31:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 02 18:31:50 2016 +0000 |
| tree | af8500a155ab76d5d7ad3afa47035304beac159e | |
| parent | d25351da83432249780050e4766f1750f31f5577 [diff] | |
| parent | b5de6a20a71bc39f9e48535fb7c351e91561bf87 [diff] |
resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp am: cacb47b2a3 am: b5de6a20a7 * commit 'b5de6a20a71bc39f9e48535fb7c351e91561bf87': Change-Id: I62f47baf6c146879270de240c619c59cff8261ee