| commit | dbf6bc3bb5a25aa271f87b7095962ec0f29640c1 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Thu Apr 20 16:06:27 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 20 16:06:27 2017 +0000 |
| tree | d11d89e532bacdb67f872727c55904e73eae46d9 | |
| parent | 993f63270f880e2d1b880f88f2930b99dceb1068 [diff] | |
| parent | 770e26ad6e12b0c999530d826fa53765fdceedaf [diff] |
Merge changes Ic029cc9f,Id917f3a2 into oc-dev am: addfe673d8 -s ours am: 770e26ad6e -s ours Change-Id: I724372ba07b4f6008e0e9240d65842b3712f56d3