commit | 1aca5049f4364557e1ca6b7dceec8ccc5966dc87 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 06 22:19:08 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 06 22:19:08 2013 +0000 |
tree | 989d6f88830804ae7eb42decc5456f6ff5960a20 | |
parent | 12634f4e61bf2896f50a674ddbf0857bc9770daf [diff] | |
parent | 76be0b6befc634d4975b4dbb39b5e03c28b6bd9c [diff] |
am 76be0b6b: am 7639d6fd: am 60915b63: Merge commit \'4b076f42bdd1408937328c626f01c7c54301fa67\' into HEAD * commit '76be0b6befc634d4975b4dbb39b5e03c28b6bd9c':