Adam Powell e0967f875e Merge "Fix NPE for Fragment#setUserVisibleHint(true)" into nyc-dev ...

am: 35c8e0fcf2

* commit '35c8e0fcf2e26f24ac21bb3df87158d4a0f4587f':
  Fix NPE for Fragment#setUserVisibleHint(true)

2016-02-18 23:53:06 +00:00

..

java

Merge "Fix NPE for Fragment#setUserVisibleHint(true)" into nyc-dev

2016-02-18 23:53:06 +00:00

jni

Merge "Optimize: Use measureText instead of doLayout." into nyc-dev

2016-02-18 23:19:44 +00:00

res

Merge "Add android:backupInForeground" into nyc-dev

2016-02-18 21:52:24 +00:00

tests

Make BackupManager encryption aware.

2016-02-18 10:54:11 -07:00