Craig Mautner 990c1b7f3e am a170dcb7: am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev ...

* commit 'a170dcb7b6908d0ea4dd7c2717d2d2b1da59262c':
  Add throwing InvalidDisplayException from addView.

2012-10-23 17:04:22 -07:00

..

java

am a170dcb7: am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev

2012-10-23 17:04:22 -07:00

jni

am fec93f67: am 39c68da5: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev

2012-10-23 15:29:47 -07:00

res

am 7fcea3ee: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

2012-10-23 10:42:15 -07:00

tests

am a23f69a8: am 86e0d95d: Merge "Reattach header view after DPAD scroll."

2012-10-23 15:03:55 -07:00