commit | a8d9db48cac077478c715459ee097008b4152eda | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 05 14:21:22 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 05 14:21:22 2012 -0800 |
tree | 69bac9eb569fa0ddc23715fa2b789ab8f2a026f2 | |
parent | 8b1d3162d8e764e5dbe43e9012a70e7f713f44da [diff] | |
parent | 90264e1becad3ddd4229536b28972a3f29d5538a [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ib9f5712e4d1a5e0f0b4807cffda4769196c64c21