commit | a72a13498e6f2a5484213c3a97b61b3f6b241f19 | [log] [tgz] |
---|---|---|
author | Hugo Benichi <hugobenichi@google.com> | Fri Jan 27 07:28:06 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 27 07:28:06 2017 +0000 |
tree | 277a80921680f92f8456065d53f0e0b043860fff | |
parent | bb1b93dfa885e1e4f17616719593a3e7880402c1 [diff] | |
parent | d49ba144f06760bd739eb0074e1f093c3657e516 [diff] |
Merge commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1' into nyc-mr1-dev-plus-aosp am: d49ba144f0 -s ours Change-Id: Ie2f8c1e18acf57238fe4816812562ecd1644cf51