Merge "Change subId to int from long" into lmp-mr1-dev
authorWink Saville <wink@google.com>
Mon, 27 Oct 2014 17:35:23 +0000 (17:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 27 Oct 2014 17:35:24 +0000 (17:35 +0000)
commit67b77ed5462382ce8184bb33cdffc0201e36d347
treecad4107f2db25486b5ee17b39271cb479d734b3c
parent938116f08e88772f6736ddd7aa7541c204538b66
parent1e5a38aa6544b231cd7feb4283b15bc8c12be884
Merge "Change subId to int from long" into lmp-mr1-dev