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

# Via Android Git Automerger (4) and others
* commit '89e7aa3dae133fd38007eddb47a3e372abb68d4d':
  Doc change: Scroller Javadoc Bug # 7966653

2013-02-07 17:29:18 -08:00

..

java

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

2013-02-07 17:29:18 -08:00

jni

Use safe buffer sizes when parsing network stats.

2013-02-07 15:02:55 -08:00

res

Merge "Import translations. DO NOT MERGE"

2013-02-08 00:45:05 +00:00

tests

Improve TrafficStats UID APIs.

2013-02-07 13:59:26 -08:00