summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAlex Sakhartchouk <alexst@google.com>2011-02-09 15:23:54 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-09 15:23:54 -0800
commit85bccf6e0b555bc5245628ba7340123b6b367b51 (patch)
treecffb29c30383a9f13d07d2f12edc022789021461 /docs
parente05bd9ee7f800ca4350a8c8b94bcfdab1f9e8217 (diff)
parent699a0969434b6ee434dd9f5f212fe1bb914fdf0d (diff)
downloadframeworks_base-85bccf6e0b555bc5245628ba7340123b6b367b51.zip
frameworks_base-85bccf6e0b555bc5245628ba7340123b6b367b51.tar.gz
frameworks_base-85bccf6e0b555bc5245628ba7340123b6b367b51.tar.bz2
am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb
* commit '699a0969434b6ee434dd9f5f212fe1bb914fdf0d': DO NOT MERGE Removing an activity that shouldn't go into samples
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions