am 422c134f: am 40bb6b9b: Merge "Add and use OverlappingPaneLayout"

* commit '422c134f4d2a4d1b7ae57e4dae3e13ea2e80b1c2':
tree: c2175942e3a631ad112fe6ab17da560c45fc1ae2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags