summaryrefslogtreecommitdiffstats
path: root/apps/Development/src/com/android/development
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-07-03 14:26:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-03 14:26:29 -0700
commit15060a5ca7f2455a3674792ae8b94536c913174e (patch)
tree4f9a917a3f6ffd953dfa471d745065c0149bc352 /apps/Development/src/com/android/development
parentd86deb31a5c917462335b6ecb39362c8cc93d467 (diff)
parent43eb9a78c3ca49c0e4de95a3f048bc0b9c6acc82 (diff)
downloadandroid_development-15060a5ca7f2455a3674792ae8b94536c913174e.tar.gz
android_development-15060a5ca7f2455a3674792ae8b94536c913174e.tar.bz2
android_development-15060a5ca7f2455a3674792ae8b94536c913174e.zip
am 43eb9a78: (-s ours) am 3e926e05: Merge "Update doc package to r2. do not merge." into jb-dev
* commit '43eb9a78c3ca49c0e4de95a3f048bc0b9c6acc82': Update doc package to r2. do not merge.
Diffstat (limited to 'apps/Development/src/com/android/development')
0 files changed, 0 insertions, 0 deletions