| commit | 974574da1a71b66f7182cf9b31487838397282aa | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Oct 04 14:39:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 04 14:39:58 2016 +0000 |
| tree | de2c2cce148bd962230ca2b24b535916cef5480f | |
| parent | cd1981c475826499763986808e64b9d63e4c253d [diff] | |
| parent | e7476a95f51b243537a747820ae56a582d44570f [diff] |
Merge changes from topic 'nfc-style' am: 1d4862a6c2 am: e7476a95f5 Change-Id: I19a9f6db1356b4643c4e340173ef3bdedef9388f