Robert Greenwalt 756c4b795e am f7c964fa: Merge "Fix Build" into lmp-preview-dev ...

* commit 'f7c964fa06257d6db1b894bfbe905ca125c755c8':
  Fix Build

2014-06-12 19:57:23 +00:00

..

java

am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev

2014-06-12 18:49:07 +00:00

jni

Merge "Add call to set power mode for display"

2014-06-12 17:09:07 +00:00

res

am 4ea9d069: Merge "Add Settings theme, fix DialogWhenLarge theme" into lmp-preview-dev

2014-06-12 19:57:17 +00:00

tests

am f7c964fa: Merge "Fix Build" into lmp-preview-dev

2014-06-12 19:57:23 +00:00