Craig Mautner 337aa27a63 am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev ...

* commit '8ee7ac22e6aec5df5405a3e2130d593c50bc39b2':
  Adds showWhenLocked attribute to Activities.

2012-10-07 11:53:43 -07:00

..

java

am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev

2012-10-07 11:53:43 -07:00

jni

am 6f3f7c68: am 9dc11eb8: Merge "Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures" into jb-mr1-dev

2012-10-05 10:59:51 -07:00

res

am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev

2012-10-07 11:53:43 -07:00

tests

Merge "Pass the originating uid to the package verifier" into jb-mr1-dev

2012-09-28 10:58:19 -07:00