| commit | abec925f05364e2efdf214fdd920019dde230009 | [log] [tgz] |
|---|---|---|
| author | Kevin Rocard <krocard@google.com> | Wed Dec 06 20:31:08 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 06 20:31:08 2017 +0000 |
| tree | 920a2c2d5fba1bf2e7122dce66abf854c72906f5 | |
| parent | e8e9cdcf5e0554b2ef305c2db29e7c2bb0eebcef [diff] | |
| parent | d7d5d7a22d404c98477bcdbcfb429e935d5fafa9 [diff] |
Merge changes from topic "b/69811500" into oc-dev am: 61ae0a1fc7 am: d7d5d7a22d Change-Id: Id4c64ec8339a7a4112b482a3cef33095c3dabc79