Doris Ling 531eb4e9f6 Merge \\"Add a secure setting for double twist gesture for camera flip.\\" into nyc-mr1-dev am: 3e869587e8 ...

am: b8d3caf4b8

Change-Id: I9265956ac2253f8a19c3a7f4dc8e6d9ada97f931

2016-07-12 01:32:40 +00:00

..

android

Merge \\"Add a secure setting for double twist gesture for camera flip.\\" into nyc-mr1-dev am: 3e869587e8

2016-07-12 01:32:40 +00:00

com

resolve merge conflicts of 0483184 to master

2016-07-11 16:59:03 -07:00

org/apache/http

…

jarjar-rules.txt

…

overview.html

…