OSDN Git Service

am 337a2003: am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33...
authorLeon Scroggins III <scroggo@google.com>
Thu, 6 Mar 2014 21:30:53 +0000 (21:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Mar 2014 21:30:53 +0000 (21:30 +0000)
commit86176afdeac9133b3b0caf2753a252167d1dad76
tree38ecdb1302f75b9a42384f4a28c640cee56435f1
parent6c506aacb2015fd23487a4aa48cbb276ad40cc3a
parent337a200361482c046fb695f46b1052aa3c85db57
am 337a2003: am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev

* commit '337a200361482c046fb695f46b1052aa3c85db57':
  Update framework to use M33 Skia. DO NOT MERGE