| commit | 60e96129be800063fb034730a81b82266a5ff802 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Oct 04 14:43:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 04 14:43:12 2016 +0000 |
| tree | 1bf949532382c21100bb015c5b1cad1882a41ab6 | |
| parent | 06b2a1dccac81627221fcd909c6cfb35c3856f19 [diff] | |
| parent | 15b5e9a71cef04e065e3485cc451dfa843fb3f44 [diff] |
Merge changes from topic 'nfc-style' am: 1d4862a6c2 am: e7476a95f5 am: 974574da1a am: 15b5e9a71c Change-Id: I42699b8a5d1b63c021e80ede9f3f138ec6ef5274