summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-10-03 15:26:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-03 15:26:37 -0700
commit7762b63be02ec80c535f526b25a3be6c334ed2eb (patch)
tree7a4070bed6f28642d94ee809f1cdc6a33ac34bb6
parent58fdf93ad948a697f026117048596709905771ff (diff)
parent6eda037eea4d90eb60152979be1ae8706f3c351a (diff)
downloaddevice_samsung_tuna-7762b63be02ec80c535f526b25a3be6c334ed2eb.zip
device_samsung_tuna-7762b63be02ec80c535f526b25a3be6c334ed2eb.tar.gz
device_samsung_tuna-7762b63be02ec80c535f526b25a3be6c334ed2eb.tar.bz2
am 58973106: (-s ours) Reconcile with jb-dev - do not merge
* commit '6eda037eea4d90eb60152979be1ae8706f3c351a':
0 files changed, 0 insertions, 0 deletions