OSDN Git Service

am b6608575: Merge "Resolved conflicts for merge of 28c6ec02 to master"
authorNarayan Kamath <narayan@google.com>
Thu, 16 Jan 2014 15:59:28 +0000 (07:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jan 2014 15:59:28 +0000 (07:59 -0800)
commitc3d161352bd09c83308d0a024b87d38f1c95b5e6
tree45636a6345029a68ba7b90e4d2adade43a96506e
parent7163e09eae3384f243d77b326faebb4382fd179a
parentb66085750ec4e8c4a2abab241ebcbf7edbfe469c
am b6608575: Merge "Resolved conflicts for merge of 28c6ec02 to master"

* commit 'b66085750ec4e8c4a2abab241ebcbf7edbfe469c':
  AArch64: Use long for pointers in media classes