summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-06-02 10:01:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-02 10:01:53 -0700
commit5b8342cf193a0255b254a5d833e6a2fac04b4b10 (patch)
treee3b9149d207cdd92d6955c7c18b5e1cde1164097 /telephony/java
parentd5335253cb55a48c0921fb23bb8dee7217f475aa (diff)
parenta86290891a661ecdc8115fd441b44dcebedb9e3d (diff)
downloadframeworks_base-5b8342cf193a0255b254a5d833e6a2fac04b4b10.zip
frameworks_base-5b8342cf193a0255b254a5d833e6a2fac04b4b10.tar.gz
frameworks_base-5b8342cf193a0255b254a5d833e6a2fac04b4b10.tar.bz2
am a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2
* commit 'a86290891a661ecdc8115fd441b44dcebedb9e3d': cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
Diffstat (limited to 'telephony/java')
0 files changed, 0 insertions, 0 deletions