commit | ded671af82db8f0b6f169a9aee96389ed0285382 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 14 11:29:34 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 14 11:29:50 2012 -0800 |
tree | a22ea58f1ff72185bc25f5bc72444b40b98c5458 | |
parent | cdd2f5571740cfe4387a66beb6ac7727e65bd8e8 [diff] | |
parent | b1bab4dc6628e2b254307613f5d56f5331646777 [diff] |
Merge from master Change-Id: I6345a9ea12d631334ae797bfd137552984f965c4