commit | 976f5e8842dfbe6054af465da33da8ded1e83a69 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 27 01:59:12 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 27 01:59:12 2014 +0000 |
tree | 4b58b2d5889eead61107faa496f6813aea5b8704 | |
parent | 88d85381258cf2106659e59c0f6411706375b843 [diff] | |
parent | 4dc72d6ba9bce20e39b1421695bb00365a7d2705 [diff] |
am 4dc72d6b: am 1f56ae67: Merge "Cherry-pick b949d02b3dab63d3f2c2d28ab28a8b80b6dc4724" * commit '4dc72d6ba9bce20e39b1421695bb00365a7d2705': Cherry-pick b949d02b3dab63d3f2c2d28ab28a8b80b6dc4724