| commit | a732719ed3d36946a3f9a5790f02e0c24d1cfbf7 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 03 04:15:46 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 03 04:15:48 2016 +0000 |
| tree | 579f011566c76eaf82b7ff58d62d0a3bfd20a3e7 | |
| parent | 0c8415a080f28b0dff25fc6861879862d52b735d [diff] | |
| parent | d6f3a2cd2f1c77aa2cb5b952c145bce220dbd67b [diff] |
Merge "resolve merge conflicts of 3481659 to nyc-dev am: 2393f4449f am: 3695fe0cc5" into nyc-mr1-dev-plus-aosp