OSDN Git Service

Merge "Fix allocation count" am: b25116f735
authorColin Cross <ccross@android.com>
Fri, 11 Dec 2015 15:27:18 +0000 (07:27 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Dec 2015 15:27:18 +0000 (07:27 -0800)
commit9547da037ae1a96b67e9410b25e236ce3efe5849
tree8761f73eea43637d65d1485b234bd52db102a6cc
parent491efee877d1f0e631f651a7c1b2bd736fc52a00
parent4b5d182fd5055a4052237785164f543fe49b8f1d
Merge "Fix allocation count" am: b25116f735
am: 4b5d182fd5

* commit '4b5d182fd5055a4052237785164f543fe49b8f1d':
  Fix allocation count