| commit | 31f813a269e4afe38d637d20074bb21164525292 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jun 30 21:05:55 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 30 21:05:55 2016 +0000 |
| tree | adafbe6ca9d526febd13c44178317188cbeec1ab | |
| parent | 464e20ece7c789cfb437bf87462e53af6427f8ab [diff] | |
| parent | 2a6cbe424e2d562cdeba8c40409ba433da479609 [diff] |
Merge "Merge \\"Move away from custom created attrs arrays DO NOT MERGE ANYWHERE\\" into nyc-dev am: 4ef9dec967 -s ours am: 79f2d737f4 -s ours" into nyc-mr1-dev-plus-aosp