commit | eeca586bda0411d162307e1581e9308f5173592e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 21 16:07:47 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 21 16:07:47 2012 -0700 |
tree | 2141a3770ea8b626f5b66e331bf70c8911debda7 | |
parent | 025aecc7180d09b73220c1218fcc002d00f2d6a2 [diff] | |
parent | 88b58dc4f13e6cad92f4f77927e410029aefeed9 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ic385ef16d6d685014334b320ddb7f1929c34bfd3