| commit | 8a71fdc37bb197700a0ec0f014438d465df0e37c | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Fri Jan 27 07:29:59 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 27 07:29:59 2017 +0000 |
| tree | 277a80921680f92f8456065d53f0e0b043860fff | |
| parent | a0c868b0ea73a0c1602fe0710fd1c09dc9508622 [diff] | |
| parent | 287c7f77cade3d4c3cc3fdc9dca37b3aa69b6662 [diff] |
Merge commit '087d29e0a2380ccb90e847e5daa52f50235731f0' into nyc-mr1-dev-plus-aosp am: 287c7f77ca -s ours Change-Id: Icf4cf5e8e95b9de4b313f826a40c1df81c02aa8a