commit | b574ce70fc4b1ff54cab95544900734f0c1bb4c2 | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@android.com> | Tue Oct 04 11:27:33 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 04 11:27:33 2011 -0700 |
tree | 18e035859e7b1b4081d197d5ffbd4f10c5f966e7 | |
parent | fa0c8e25403290b545bb98735b1ece275c524361 [diff] | |
parent | a2f29cb6efc83df073e66a3cf2c7ba02709b4257 [diff] |
am a2f29cb6: (-s ours) Cherrypick fa0c8e from master. do not merge. * commit 'a2f29cb6efc83df073e66a3cf2c7ba02709b4257': Cherrypick fa0c8e from master. do not merge.