OSDN Git Service

resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am...
authorEino-Ville Talvala <etalvala@google.com>
Fri, 15 Jan 2016 00:57:18 +0000 (00:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jan 2016 00:57:18 +0000 (00:57 +0000)
commit240c2126e491eb3f3d3ffce35bc1fd33e9e350b4
treee73accf4133146bc489c380a720173e55c6e7fbe
parentfb5043a703f596b7393c1e24ca4b321b0f697293
parenteab078d0b1abebf6f005fd95df72eca107c3e80c
resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 am: 1ab7985b88 am: 6313e262f9  -s ours am: 2da2f1b383
am: eab078d0b1

* commit 'eab078d0b1abebf6f005fd95df72eca107c3e80c':
  Camera: Disallow dumping clients directly