summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2015-03-20 22:08:33 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 22:08:33 (GMT)
commit4f033908bd76e57ebb53c398ee56949db60a03f0 (patch)
tree0fc13fd92643f45f47367ee042360cbfee28b309
parent7158b6705d330ac1e61d5aa51c51b54507c4ab88 (diff)
parent18aa7840e17473544a80205367435e9c2e8b7527 (diff)
downloadandroid_frameworks_ex-4f033908bd76e57ebb53c398ee56949db60a03f0.zip
android_frameworks_ex-4f033908bd76e57ebb53c398ee56949db60a03f0.tar.gz
android_frameworks_ex-4f033908bd76e57ebb53c398ee56949db60a03f0.tar.bz2
am 18aa7840: resolved conflicts for merge of 1870c071 to lmp-dev-plus-aosp
* commit '18aa7840e17473544a80205367435e9c2e8b7527': Remove deprecated carousel from frameworks/ex.
0 files changed, 0 insertions, 0 deletions