OSDN Git Service

am 7f9a9bc7: resolved conflicts for merge of e9febcc0 to master
authorNarayan Kamath <narayan@google.com>
Tue, 28 Jan 2014 20:21:52 +0000 (12:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Jan 2014 20:21:52 +0000 (12:21 -0800)
commit161322e602ec942f22783c9225e3be98b8c345b7
tree2e340d6d98cd555a33dfbc3eb6ae0fbcf9951f3f
parentfdc8188cedfab1a1764e6dc07c5a66e2e09382ba
parent7f9a9bc7bfc3bf1ac7de4f20431017d37a28a315
am 7f9a9bc7: resolved conflicts for merge of e9febcc0 to master

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