summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-11-22 17:32:04 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-22 17:32:04 -0800
commitcfe5283b9e25abb5067927df66356611dfbbb377 (patch)
tree91cba3d4c4e694953f72605c4fee7b9be933d0cb
parentffcbb026045655bdf88593bdad333a69ed60cd8c (diff)
parent70dfaee6386ab7564718f576c4c0b45da4274212 (diff)
downloadppp-cfe5283b9e25abb5067927df66356611dfbbb377.tar.gz
am 70dfaee6: Merge commit \'6c569d212164aa9334e27abac8884a3d13999420\' into HEAD
* commit '70dfaee6386ab7564718f576c4c0b45da4274212':
0 files changed, 0 insertions, 0 deletions