summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2012-04-06 09:53:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-06 09:53:56 -0700
commite08284dcfceb6cc4109affb78306eaf5f6e936db (patch)
tree9259866ff2153c1818857e80920ebcb4382a6598
parentd00576709d90efb859cdc770fb15ca952f2a82b7 (diff)
parentfbff4f6b0ebf556ac825e34a587ba0f416b3db14 (diff)
downloadframeworks_base-e08284dcfceb6cc4109affb78306eaf5f6e936db.zip
frameworks_base-e08284dcfceb6cc4109affb78306eaf5f6e936db.tar.gz
frameworks_base-e08284dcfceb6cc4109affb78306eaf5f6e936db.tar.bz2
am fbff4f6b: am ae6323dd: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
* commit 'fbff4f6b0ebf556ac825e34a587ba0f416b3db14':
0 files changed, 0 insertions, 0 deletions