| commit | cec24e4a2ccb7f11bdaaa29115b3b7c806536ec4 | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Mon Jul 24 17:12:38 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 24 17:12:38 2017 +0000 |
| tree | 6746fe1db5a29a72e77e1e92d392e3c02b76af4a | |
| parent | 6aef32af4dd481b4a3025efafd6c96f778368696 [diff] | |
| parent | bb4c42ccb79e3ac2456a0aa825b13bd09bd10149 [diff] |
Merge "Fix potential build break" into oc-dev am: 7740a78495 -s ours am: bb4c42ccb7 -s ours Change-Id: Ieb5b9b462482e453adf9af802667ffb13109309b