| commit | c285bc82850600e31dae7626f2379116fd57eb9f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jun 07 04:48:25 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 07 04:48:25 2016 +0000 |
| tree | d6f70f96a6a1dcf4c948d8a9a8016a3f8edcce4c | |
| parent | c71f9034cac9c3d08b13a3d3c29b0e04238bb1dd [diff] | |
| parent | d7a4d6c7a6d6238dc16b6e73861890da98f84e7e [diff] |
Merge "resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am: 20352727af am: b8f947f727 * commit 'b8f947f7278dc0d23a4b30e531b8df08050d1d92': Change-Id: I727e3a8852a783ef328933aab3ad554cd2bdaeab