Christopher Tate d2426a91f2 am 1a2fac3e: Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev ...

* commit '1a2fac3eeda031ac5f4c7d17c883d54af5661a66':
  Use myUserId() only in registerContentObserver()

2012-10-03 18:57:23 -07:00

..

java

am 1a2fac3e: Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev

2012-10-03 18:57:23 -07:00

jni

am 5a829cbf: Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev

2012-10-03 16:01:15 -07:00

res

Merge "Remove unneeded margin below action bar subtitles" into jb-mr1-dev

2012-10-03 18:50:10 -07:00

tests

…