refs/heads/jb-mr2-dev - platform/frameworks/base.git

commit: c0f5bb70b72c25c0057d2318bbcc8d79553d1e12
[log]
author: Scott Main <smain@google.com>
Fri Jul 12 14:20:11 2013 -0700
committer: Android Git Automerger <android-git-automerger@android.com>
Fri Jul 12 14:20:11 2013 -0700
tree: 5502e0afd41dc21649cb3ccd33e809ee99746470
parent: 925ec03fcd9651ff4c6b04982eb6d930b16493b9 [diff]
parent: ca4b112eb243b1350aba000c4f021574be25bd96 [diff]

am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos

* commit 'ca4b112eb243b1350aba000c4f021574be25bd96':
  add warning for Windows users and fix typos

tree: 5502e0afd41dc21649cb3ccd33e809ee99746470