commit | f688b2aebf629d24d191a9cffa431703923420a3 | [log] [tgz] |
---|---|---|
author | Hugo Benichi <hugobenichi@google.com> | Mon Jan 23 11:15:05 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jan 23 11:15:05 2017 +0000 |
tree | 35329f75e19fe5bc34c93d82c985902855bc4d50 | |
parent | ae4265775c9c2e3edd8ed490ba6137d46a8bd298 [diff] | |
parent | 767b7ad7dc6159e187730d90ed12501ca0a4f8eb [diff] |
Merge changes Idbde7000,Idde3c9d0 into nyc-mr2-dev-plus-aosp am: 767b7ad7dc Change-Id: I3d5a6c31629a5756e0ea97c9a66a19cc702bc5c6