| commit | 8fe0e5f2129d19c4a08d100ca0db10a2d38b9045 | [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 | 1a614a08567bebbd26542d0f453d5fa5b90c68a0 [diff] |
Merge "Fix potential build break" into oc-dev am: 7740a78495 -s ours am: 1a614a0856 -s ours Change-Id: Ia513df7e98c42abdb2b16bfb4318ba0a82e48fa6