| commit | cd97a641eb5e903774a50cdb5e27768a28633dcb | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Sat Jan 31 08:04:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 08:04:42 2015 +0000 |
| tree | 16b61835d1d19c4d555679fd7aee35d1f9e78ce6 | |
| parent | d58870e0a9c00257fad191cf35e15c3b8195c9d3 [diff] | |
| parent | dcce25a9a7fb3458f2fb65b23912b5f7eb42c596 [diff] |
am dcce25a9: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a automerge: 4a82635 * commit 'dcce25a9a7fb3458f2fb65b23912b5f7eb42c596':