commit | 5adafd52a0b5db71010e6d108e83214bce0af2c4 | [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 | 1f23776b45efdf9bb4c28561979d86142927003e | |
parent | a49ee229138192aff86676da1d511cf4753ddba2 [diff] | |
parent | d81cd2fe4572b8fc892d168ac527ac47f2c45bf1 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ib9f5712e4d1a5e0f0b4807cffda4769196c64c21