| commit | c5afb24e062fc44a81d0b18d0427ef7e25fc6f45 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Oct 17 23:39:44 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 17 23:39:44 2017 +0000 |
| tree | cd614a95db992f2489e7b78e9e72b3a3439f27a1 | |
| parent | 3b8e72e0499234cbcdb3e289fb50a00ad09afea8 [diff] | |
| parent | c5008ed2dd2d18902e39033248847b1e5a319c07 [diff] |
Merge commit '97160a161f8eeb38018cd735a6adb64c4cebd375' from oc-dev into stage-aosp-master am: eea1d23669 am: c5008ed2dd Change-Id: I579664c9d53b720c8f830119973f2e18b94fc440