| commit | 2d38fced00a873da8077a5193b2d5ef8603dcc66 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 22 14:32:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 22 14:32:44 2013 -0700 |
| tree | f24fc6b2f370790941d0b0e04ff443571c8727cb | |
| parent | 5cf93f8d91be8e7e1654d7eee5966d6da5d6fe85 [diff] | |
| parent | 7003a14b536bad08476d2f2005ebcc0490b77b24 [diff] |
am 7003a14b: am 41f08abf: Merge "Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a." * commit '7003a14b536bad08476d2f2005ebcc0490b77b24': Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.