Kenny Root 9396f183c2 resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp ...

Change-Id: I21512d61b5c08cee5fed69b34c3275ba5c3fc0d8

2012-10-19 17:16:41 -07:00

..

android

am e9472f29: am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev

2012-10-19 14:43:50 -07:00

com

Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev

2012-10-19 16:37:55 -07:00

jarjar-rules.txt

…

overview.html

docs: fix several links

2012-06-22 12:35:08 -07:00