summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2014-10-28 07:16:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-28 07:16:13 +0000
commit831296e84f5929637d437a4b9a9cf7e1d9d539e9 (patch)
treeb05d8491f8358ac014b5012b1e2e29f900e453ae /core/java
parentb2dda6903131d7534fc2e92d0049f05821f36210 (diff)
parentae85478d3dbed145825293c307bde4213ff175f3 (diff)
downloadframeworks_base-831296e84f5929637d437a4b9a9cf7e1d9d539e9.zip
frameworks_base-831296e84f5929637d437a4b9a9cf7e1d9d539e9.tar.gz
frameworks_base-831296e84f5929637d437a4b9a9cf7e1d9d539e9.tar.bz2
am ae85478d: am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev automerge: e5b4c12
* commit 'ae85478d3dbed145825293c307bde4213ff175f3': Change subId to int from long
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions