commit | d86dab44ce64d82d56d745e7f21d0c8eb4250496 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 15 11:23:21 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 11:23:21 2012 -0700 |
tree | 85e7728d38fba2dd8991d869a1729c0e9d18abba | |
parent | a0a2f0c6fa125ca3594282f6fdb0e40d8adcbf8b [diff] | |
parent | f4aee7bd601621d648044a0f918247fd81b6190a [diff] |
am f4aee7bd: Merge "back port upstream patch" * commit 'f4aee7bd601621d648044a0f918247fd81b6190a': back port upstream patch