commit | 6b415b7d0530151ffa3221594102a6752a539692 | [log] [tgz] |
---|---|---|
author | Yu Shan Emily Lau <yslau@google.com> | Tue Nov 08 16:03:19 2011 -0800 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 08 16:03:19 2011 -0800 |
tree | d3a7fe4ad81bb03b82e2419ec069bef3eae21437 | |
parent | c3b0837982378fc1277295fb2322e33f6414a0b9 [diff] | |
parent | 887527429d207f53df9c45ade98b98afbee61710 [diff] |
Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0