OSDN Git Service

am 9932d648: am 1a6e29aa: am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge...
authorNarayan Kamath <narayan@google.com>
Wed, 29 Jan 2014 15:43:56 +0000 (07:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jan 2014 15:43:56 +0000 (07:43 -0800)
commit22737d276a3ca2c79a89e138997758e788798392
treef391153953e6112b1181c1f1114a3bb1e103cb6a
parent698bf65a437db2c518c5b702a4c46d9f334441ba
parent9932d648834a8fae4f98e6985ce1112ddf28da0b
am 9932d648: am 1a6e29aa: am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."

* commit '9932d648834a8fae4f98e6985ce1112ddf28da0b':
  mNativeCanvas is long, not int.