OSDN Git Service

am f694d378: (-s ours) resolved conflicts for b161297d to lmp-mr1-ub-dev
authorZach Jang <zachjang@google.com>
Mon, 21 Sep 2015 23:57:04 +0000 (23:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Sep 2015 23:57:04 +0000 (23:57 +0000)
commita5842d3e17f2d619f5de7bfae85f58ff9642dae4
tree3110964e1210105dfb31b836787060a9d2843a48
parent2ad5c0cca46b7f0a159dbc90243756c84a93b093
parentf694d378955ddac3ee2651080bfa00c5ae39dddc
am f694d378: (-s ours) resolved conflicts for b161297d to lmp-mr1-ub-dev

* commit 'f694d378955ddac3ee2651080bfa00c5ae39dddc':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3