| commit | 342de69fa9d3e7202c606712f5803ed941d31d9c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:42:05 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:42:05 2013 -0700 |
| tree | b012d7678c9ba215c95a9c3b7b116efa3cc8d13f | |
| parent | baf8ef51713b8ab960d46c8d888b7dd3cf1a74d4 [diff] | |
| parent | fffd02e908eb9893e6308ee9cd2445ef56e96de0 [diff] |
am fffd02e9: (-s ours) am a8497f6f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'fffd02e908eb9893e6308ee9cd2445ef56e96de0':