diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-10-31 09:16:51 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2012-10-31 09:16:51 -0700 |
commit | f4ec2c66f92498c80dd5e9c85163215892b8d993 (patch) | |
tree | bcf3c29e79e7fca3f11dbc8b060a1695bc9e4ef4 | |
parent | 28ed566a7471cbd36c70bc9568840dd555dc64c3 (diff) | |
parent | 09a864a0f316dd3f4b249f0e03deff5745a693dd (diff) | |
parent | b6d089e3b6724b81ecb65b0b74c92595b4c1af23 (diff) | |
download | android_frameworks_ex-f4ec2c66f92498c80dd5e9c85163215892b8d993.tar.gz android_frameworks_ex-f4ec2c66f92498c80dd5e9c85163215892b8d993.tar.bz2 android_frameworks_ex-f4ec2c66f92498c80dd5e9c85163215892b8d993.zip |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I07d9b3314cf10da7c665babd6f15e196a74829c7