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