| commit | b5de6a20a71bc39f9e48535fb7c351e91561bf87 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Mon May 02 18:27:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 02 18:27:24 2016 +0000 |
| tree | 491b260014a699b690ce32b1a9554b14eb3705ed | |
| parent | 70b5353274a72109b7cb8b259f40075f073f35a0 [diff] | |
| parent | cacb47b2a38a84eaae94dd10857a83b7c6b1885e [diff] |
resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp am: cacb47b2a3 * commit 'cacb47b2a38a84eaae94dd10857a83b7c6b1885e': Change-Id: Icdaf7e9132e807ae9a7076b92b91bae8632269ec