| commit | 770e26ad6e12b0c999530d826fa53765fdceedaf | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Thu Apr 20 04:34:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 20 04:34:48 2017 +0000 |
| tree | 0f2e2b8686f0cf45c8eda0ab13c26483f169f5f0 | |
| parent | 375d615b30a585e429cc2f83ac8ec58de2091634 [diff] | |
| parent | addfe673d8c02ac6ccc7049b4e71fe71c74897b1 [diff] |
Merge changes Ic029cc9f,Id917f3a2 into oc-dev am: addfe673d8 -s ours Change-Id: I2c62317b3a03edab06aa72d21e801d4355a85106