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