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