OSDN Git Service

am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev
authorWink Saville <wink@google.com>
Mon, 27 Oct 2014 21:30:48 +0000 (21:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 27 Oct 2014 21:30:48 +0000 (21:30 +0000)
commitae85478d3dbed145825293c307bde4213ff175f3
tree318ef19ca9142d561e44ae84a44e5e6c5b121f6e
parent4d4b2cfd4c611800787b71d0896c6d8781875732
parente5b4c1219a32a086508d83101c10605dd894e4d2
am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev
automerge: e5b4c12

* commit 'e5b4c1219a32a086508d83101c10605dd894e4d2':
  Change subId to int from long
telephony/java/android/telephony/TelephonyManager.java