| commit | 556d183f87e6050c438b3f2f612ddb212323fc0a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Sep 18 10:52:38 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 18 10:52:38 2012 -0700 |
| tree | d50766d5f08027a99850339ff27ab9b7da6a2810 | |
| parent | 8c60aa385359a53ad8e23dd093114da6f4a55469 [diff] | |
| parent | f1d75a6b035666f473be49a739651d62693c1fde [diff] |
Merge "resolved conflicts for merge of 0003d599 to jb-mr1-dev"