Katie McCormick 2306f0ee33 am ee27bcda: am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev ...

# Via Android Git Automerger (2) and others
* commit 'ee27bcda8644f8c3f2328acc248b8c5c9d152f59':
  Doc change: Scroller Javadoc Bug # 7966653

2013-02-07 17:23:00 -08:00

..

java

am ee27bcda: am b68702eb: am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev

2013-02-07 17:23:00 -08:00

jni

am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev

2012-11-06 17:43:05 -08:00

res

Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE

2013-01-30 12:30:03 -08:00

tests

Fix WiFi test:

2013-01-30 18:52:27 -08:00