| commit | 0974e1fe11bc0fd91bb4de72078715b5446784ea | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Apr 22 15:20:25 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 22 15:20:27 2016 +0000 |
| tree | ee183b7435afd9d6408bfccc8da971c0a5d54f9e | |
| parent | 01a770303ac2ecab96f0667e828bd06880c9283d [diff] | |
| parent | 86586ad3b7098e2ace1462338fe699fc91ae95f0 [diff] |
Merge "resolve merge conflicts of 9d1357c to nyc-dev-plus-aosp am: 067d95dd2b" into nyc-mr1-dev-plus-aosp