OSDN Git Service

Merge "Fix constant type"
authorDavid Sehr <sehr@google.com>
Wed, 3 Aug 2016 17:15:00 +0000 (17:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 Aug 2016 17:15:00 +0000 (17:15 +0000)
commit5dc5b7669d07e6c67ba9ec49dc537ecac28214d3
tree9ccd982064da05d555f642c3eecb5b0ae2127222
parentb600c54b7c1d2eee39579b25390b10534c8c3235
parent01b7982a45fe53218d432ed1e8172d9d032d93ab
Merge "Fix constant type"
am: 01b7982a45

Change-Id: Ie4b0bb80c820e9483348ec75b932c6ef04ccfeeb