| commit | 276bff1adc13a1e386d125abdaccde4e2bf3640e | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Mon Jun 23 19:50:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 19:50:20 2014 +0000 |
| tree | b3b5c36a167e4d77bbbd612e9f2a90cb287fcd60 | |
| parent | 179ea8656543a5e052d1426ac3c01cf1e82971b1 [diff] | |
| parent | 7018a8a01fa0bf65c715a32d7781cad0b46753ca [diff] |
am 7018a8a0: am 6889dfab: am e0b8940b: am 4a17a810: am 72dbb5bf: merge in release branch changes (no-op). * commit '7018a8a01fa0bf65c715a32d7781cad0b46753ca':