commit | 3833b897a434e958be72a96e275f3e60a7bc18ff | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 06 22:19:18 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 06 22:19:18 2013 +0000 |
tree | eaff7d37ba3032d6462fa461c4a03f7828481db1 | |
parent | 0556974736b5d7ff19d830581ad8b360d2d62f13 [diff] | |
parent | 3881c3ae357b3befec9226bcbf72f5a916457f97 [diff] |
am 3881c3ae: am 84a0fc9c: am e83cfe69: Merge commit \'504c5d9c6e05cecabcb2404a2fd1a05259602858\' into HEAD * commit '3881c3ae357b3befec9226bcbf72f5a916457f97':