OSDN Git Service

am fa970bb1: am 8773d51e: resolved conflicts for merge of b82b2f98 to klp-dev-plus...
authorNarayan Kamath <narayan@google.com>
Tue, 28 Jan 2014 20:01:44 +0000 (20:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Jan 2014 20:01:44 +0000 (20:01 +0000)
commite9febcc02e501e88218cbc5c18143c8fd1a9b6b9
treefb0a6ce6e343816f3ae6f7415d395e203bb983fd
parenta35ca0ada33757164003cd7aee635e6066d83893
parentfa970bb1e8ab3cd734f1719ac8590b43d1e40962
am fa970bb1: am 8773d51e: resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp

* commit 'fa970bb1e8ab3cd734f1719ac8590b43d1e40962':
  Track 64bit changes to android/graphics.