summaryrefslogtreecommitdiffstats
path: root/apps/Development/src/com/android
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-05-17 12:23:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-17 12:23:50 -0700
commit149c180522aa5f0f9dfef121387284891272d421 (patch)
tree1684f98646e50e761f6d08037b36821f8584ca17 /apps/Development/src/com/android
parent7d747db6b1248d27d51d673ea3146b1294acbd67 (diff)
parent8fc94823cfd7f9f2403f1ad553d84544252c7849 (diff)
downloadandroid_development-149c180522aa5f0f9dfef121387284891272d421.tar.gz
android_development-149c180522aa5f0f9dfef121387284891272d421.tar.bz2
android_development-149c180522aa5f0f9dfef121387284891272d421.zip
am 8fc94823: am 42a6c754: am 3a38c110: Merge "Fix mac build"
* commit '8fc94823cfd7f9f2403f1ad553d84544252c7849': Fix mac build
Diffstat (limited to 'apps/Development/src/com/android')
0 files changed, 0 insertions, 0 deletions