Irfan Sheriff 749728e391 Merge commit '949dcad8' into manualmerge ...

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: I02fee6839c2a8879fb6e885d8fc8483f17d655c2

2012-08-27 23:03:50 -07:00

..

android

Merge commit '949dcad8' into manualmerge

2012-08-27 23:03:50 -07:00

com

Merge "Add setOnDismissListener to AlertDialog.Builder" into jb-mr1-dev

2012-08-27 14:04:29 -07:00

jarjar-rules.txt

…

overview.html

docs: fix several links

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