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

* commit '33877e15b8bfc50bd874027689a4794aa93b923d':
  Adds showWhenLocked attribute to Activities.

2012-10-07 11:50:54 -07:00

..

java

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

2012-10-07 11:50:54 -07:00

jni

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

2012-10-05 10:56:41 -07:00

res

Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev

2012-10-07 11:48:50 -07:00

tests

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

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