summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-06-11 16:56:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-11 16:56:04 -0700
commitd5fd97c70b23f65e4135dff7187b83f549773e4b (patch)
treeba7baa1cbc2a4ab93b7523a90df9c8b132aab577
parent7cff0854f44da547e08a59715b547f6e17ee5d47 (diff)
parent6c622422b63502acc8a9b7c9a8b71c82c8fce145 (diff)
downloadframeworks_native-d5fd97c70b23f65e4135dff7187b83f549773e4b.zip
frameworks_native-d5fd97c70b23f65e4135dff7187b83f549773e4b.tar.gz
frameworks_native-d5fd97c70b23f65e4135dff7187b83f549773e4b.tar.bz2
am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b' into gingerbread * commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b': Doc change: remove pdf summary of guidelines from templates archive.
0 files changed, 0 insertions, 0 deletions