| commit | 3c376c6fac2497640e68c75fd4a0e1fa0d79c3b0 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 20 01:30:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:30:14 2015 +0000 |
| tree | 9c2e454c26ffa34508fa515be8342f3d582f92fd | |
| parent | 647adb5154454912e33d8fdaab70ea7fedb280b4 [diff] | |
| parent | 3e15e6d738d02efb4108251cdc75240569916b69 [diff] |
am 3e15e6d7: am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev * commit '3e15e6d738d02efb4108251cdc75240569916b69': Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"