commit | abf02a95a0da7df9f700c54b5374dcadf85775e3 | [log] [tgz] |
---|---|---|
author | Jean-Michel Trivi <jmtrivi@google.com> | Wed Jan 26 14:05:18 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 26 14:05:18 2011 -0800 |
tree | d5686270469e6719a80275f0c3e20b9c51a92c2e | |
parent | 73fa8add777952799edc1d95048d7289f6176837 [diff] | |
parent | 30acaa88510fda75f135ca0d26de80d6f91cc484 [diff] |
am 2ba92c71: do not merge bug 3370834 Cherrypick from master * commit '2ba92c71b5684dce700cf848bf157153c156df1d': do not merge bug 3370834 Cherrypick from master