| commit | 27cfae61bc8c85836bd09740f6037a72e850f5a5 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jun 09 02:54:15 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 09 02:54:17 2016 +0000 |
| tree | 8ccf571344ab2e2425beea48f179c998e5e35b47 | |
| parent | d7bf982cd7fdb010801201133787875a81bb30a8 [diff] | |
| parent | 02be58fdcc39b215cbc9d510f8c7170aca716b0b [diff] |
Merge "DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950 -s ours am: 2d03c0f956 am: dc9a7c7b23 am: e892848035 am: 7e2c6c3440 -s ours am: 9f0a266df9 am: 7f760d86bf" into nyc-mr1-dev-plus-aosp