commit | 9af47914d11f72f9f18719c3ab4ffdf757aa8bf6 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 06 01:43:39 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 06 01:43:39 2013 +0000 |
tree | 97da076238a4045ea781d251b04e9c8c0698c28c | |
parent | 1e68da00aae35627e0a6f07b4cfb8860f7281572 [diff] | |
parent | 33137ed583f451de469c5975c73751c1eb249f09 [diff] |
am 33137ed5: am f6f523a0: Merge commit \'1aaaebb25db3ae24e6a55f89a1b9e19a8d6c0b99\' into HEAD * commit '33137ed583f451de469c5975c73751c1eb249f09':