| commit | e74066145ef9fcd422f1e1231df6ccafe36299a9 | [log] [tgz] |
|---|---|---|
| author | Lei Zhang <antiagainst@google.com> | Tue Jul 19 18:33:37 2016 -0400 |
| committer | Lei Zhang <antiagainst@google.com> | Tue Jul 19 18:33:37 2016 -0400 |
| tree | d871dd8d2273481457c1c48ef975b9cabeb89528 | |
| parent | 5cfb387e0b49161698b0676b1d359c120bee4819 [diff] | |
| parent | 3814effb879ab5a98a7b9288a4b4c7849d2bc8ac [diff] |
Merge remote-tracking branch 'aosp/upstream-master' Pulls in the following: 3814eff Rev. 6 of 1.0 and Rev. 2 of 1.1 headers (changed headers). afd72ce Rev. 6 of 1.0 and Rev. 2 of 1.1 headers. Change-Id: I90f1f891304bc47676186197246f9679c88b45b8