| commit | 2a02a2a33ccc60c1730cb234a71119e30f57b281 | [log] [tgz] |
|---|---|---|
| author | Chiao Cheng <chiaocheng@google.com> | Thu Nov 29 15:10:51 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 15:10:51 2012 -0800 |
| tree | 9ee81f41b788875981ba4f6c785f67993a94b884 | |
| parent | 4e9a6e6e3a4fe317c8f51956c92670e7d0aac88e [diff] | |
| parent | 6eb4e2305c23fb1036db4926786846d49475f1eb [diff] |
am 6eb4e230: (-s ours) am 9d8108fe: am 226fae4d: Merge "Cherry picking BitmapUtilTest fix." into jb-mr1.1-dev * commit '6eb4e2305c23fb1036db4926786846d49475f1eb': Cherry picking BitmapUtilTest fix.