Makoto Onuki f56aa71b9f Merge "Don\'t allow deactivating DAs when the user is not unlocked" into nyc-dev ...

am: dafec11e69

* commit 'dafec11e698daf054730cfb04db64f3e31a0c9ff':
  Don't allow deactivating DAs when the user is not unlocked

2016-02-16 20:53:03 +00:00

..

android

Merge "Force resize pre-N apps that don\'t have fixed orientation." into nyc-dev

2016-02-16 18:00:24 +00:00

com

Merge "Don't allow deactivating DAs when the user is not unlocked" into nyc-dev

2016-02-16 20:47:10 +00:00

org/apache/http

org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser

2016-01-21 17:04:58 +00:00

jarjar-rules.txt

…

overview.html

…