| commit | 316639f3fa12ecdd6ae9961210527318b564b820 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Mon Oct 17 16:23:11 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 17 16:23:11 2016 +0000 |
| tree | e56d49e1c20378ddcc8bda9b7a8756454d8b7f75 | |
| parent | 2845cd8e65ec8047032a65f98b46d6ed389d4912 [diff] | |
| parent | 2bbecd660702354e4a3db1251f2897c8dcea32d7 [diff] |
Merge changes from topic 'nfc-style' am: e397b73792 am: 68a86b448c am: 2bbecd6607 Change-Id: I16ee515f5590d789e64ba2f26982d145f5881977