| commit | 23e5a1ee6527f7d2728b02583263266d855de5ae | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Thu Jun 08 05:54:33 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 08 05:54:33 2017 +0000 |
| tree | 04dcb334a3d26f9b614e158ae639459c6e10029c | |
| parent | 7c44479edfe4a4622e848e2d2cc7cd452df8191c [diff] | |
| parent | 3834421c96ec503eff36e3eedceb7a06558a2a40 [diff] |
Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96 Change-Id: I691d03a8396d26193622f171f70f82d7aa91cea2