Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android / packages / apps / Settings / d59b0eddae320bc72f5a2343d1aa8463dae578ab
commitd59b0eddae320bc72f5a2343d1aa8463dae578ab[log] [tgz]
authorTreeHugger Robot <treehugger-gerrit@google.com>Mon Apr 09 20:29:54 2018 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>Mon Apr 09 20:29:54 2018 +0000
treee2a6c28883ecab9065899010a6fc268fc2562fd1
parentc4127072f4574fb6dbf11c78166e6a089ca0a5c2 [diff]
parent1990791bfe14da4581580e51743c18221e304c59 [diff]
Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617 skipped: b1f00ebf9c
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
  DO NOT MERGE Fix unexpected behavior in Bluetooth pairing
tree: e2a6c28883ecab9065899010a6fc268fc2562fd1
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. MODULE_LICENSE_APACHE2
  8. NOTICE
  9. PREUPLOAD.cfg
  10. proguard.flags
  11. wrap_alpha.py