summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike J. Chen <mjchen@google.com>2012-05-17 12:40:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-17 12:40:24 -0700
commit08083da011f5dfd9b7dbd45ec0d7016be9422cd5 (patch)
tree9ecfd9783b98cf733fb837bb067b86100be742f9
parentba362ca08c550a9f15ce6947cbe64d4aa437ff49 (diff)
parent97160be189cd52b5cb8eecf97fd47ed034b54f5c (diff)
downloadhardware_ti_omap4xxx-08083da011f5dfd9b7dbd45ec0d7016be9422cd5.zip
hardware_ti_omap4xxx-08083da011f5dfd9b7dbd45ec0d7016be9422cd5.tar.gz
hardware_ti_omap4xxx-08083da011f5dfd9b7dbd45ec0d7016be9422cd5.tar.bz2
am 97160be1: (-s ours) DO NOT MERGE
* commit '97160be189cd52b5cb8eecf97fd47ed034b54f5c': DO NOT MERGE
0 files changed, 0 insertions, 0 deletions