summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | | | | Merge "DO NOT MERGE Convert the scheme to lowercase" into klp-devSelim Gurun2014-01-161-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | DO NOT MERGE Convert the scheme to lowercaseSelim Gurun2014-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9793586 This is to fix a bug in I8f6f03b05556ee4d6846c15752de9be54c003060. Change-Id: I643fb1b0730e1e6b391c9c5af69cf7b86cbcdfe5
* | | | | | | | | | | | | | | | | | | | Convert the scheme to lowercaseSelim Gurun2014-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9793586 This is to fix a bug in I8f6f03b05556ee4d6846c15752de9be54c003060. Change-Id: I643fb1b0730e1e6b391c9c5af69cf7b86cbcdfe5
* | | | | | | | | | | | | | | | | | | | am abfd8734: am d588aaeb: am 5f9ac43a: am 66d2de91: am 1e395bf5: am ↵Selim Gurun2014-01-161-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3e09d43: am dea3d2ad: am 81cb07dc: am f8c18437: am 699496ca: am 6243e7cb: Restrict loading private browser files * commit 'abfd8734aa368170046b534bbcea30a48b6e7b0a': Restrict loading private browser files
| * | | | | | | | | | | | | | | | | | | am d588aaeb: am 5f9ac43a: am 66d2de91: am 1e395bf5: am e3e09d43: am ↵Selim Gurun2014-01-161-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dea3d2ad: am 81cb07dc: am f8c18437: am 699496ca: am 6243e7cb: Restrict loading private browser files * commit 'd588aaeb5cac3c712c47c688ae11b1bd2fccfc68': Restrict loading private browser files
| | * | | | | | | | | | | | | | | | | | am 5f9ac43a: am 66d2de91: am 1e395bf5: am e3e09d43: am dea3d2ad: am ↵Selim Gurun2014-01-161-0/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81cb07dc: am f8c18437: am 699496ca: am 6243e7cb: Restrict loading private browser files * commit '5f9ac43a65943dc1769d08c7464395af9b7ff7da': Restrict loading private browser files
| | | * | | | | | | | | | | | | | | | | am 66d2de91: am 1e395bf5: am e3e09d43: am dea3d2ad: am 81cb07dc: am ↵Selim Gurun2014-01-161-0/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | |/| / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8c18437: am 699496ca: am 6243e7cb: Restrict loading private browser files * commit '66d2de91e8a6741ea86c1da3faf1cfa28b515287': Restrict loading private browser files
| | | | * | | | | | | | | | | | | | | am 1e395bf5: am e3e09d43: am dea3d2ad: am 81cb07dc: am f8c18437: am ↵Selim Gurun2014-01-161-0/+21
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 699496ca: am 6243e7cb: Restrict loading private browser files * commit '1e395bf5184e309c857c90ce2a439b5f3d87d2fc': Restrict loading private browser files
| | | | | * | | | | | | | | | | | | | am e3e09d43: am dea3d2ad: am 81cb07dc: am f8c18437: am 699496ca: am ↵Selim Gurun2014-01-161-0/+21
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / | | | | | |/| / / / / / / / / / / / / | | | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6243e7cb: Restrict loading private browser files * commit 'e3e09d431c7ccfd6cda66bdd7df4845e13787c35': Restrict loading private browser files
| | | | | | * | | | | | | | | | | | am dea3d2ad: am 81cb07dc: am f8c18437: am 699496ca: am 6243e7cb: Restrict ↵Selim Gurun2014-01-151-0/+21
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loading private browser files * commit 'dea3d2ad90052a3828b2eb581354210430d103f4': Restrict loading private browser files
| | | | | | | * | | | | | | | | | | am 81cb07dc: am f8c18437: am 699496ca: am 6243e7cb: Restrict loading private ↵Selim Gurun2014-01-151-0/+21
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | browser files * commit '81cb07dcd6e81f8ba7bdb72f3321dc64a6595da1': Restrict loading private browser files
| | | | | | | | * | | | | | | | | | am f8c18437: am 699496ca: am 6243e7cb: Restrict loading private browser filesSelim Gurun2014-01-151-0/+21
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8c1843783a5bc8b0b5198e695bad96e9595d921': Restrict loading private browser files
| | | | | | | | | * | | | | | | | | am 699496ca: am 6243e7cb: Restrict loading private browser filesSelim Gurun2014-01-151-0/+21
| | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / / | | | | | | | | | |/| / / / / / / / | | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | * commit '699496ca7b8bc7ef2727a6681eb95aa8ac78e59b': Restrict loading private browser files
| | | | | | | | | | * | | | | | | am 6243e7cb: Restrict loading private browser filesSelim Gurun2014-01-151-0/+21
| | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6243e7cb0eb836af28b23a2e00d89627b90496e4': Restrict loading private browser files
| | | | | | | | | | | * | | | | | Restrict loading private browser filesSelim Gurun2014-01-151-0/+21
| | | | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:11516871 Change-Id: I6a717a157f3d29edfffc36dc2da45c6df30d6ccd
* | | | | | | | | | | | | | | | am 9200ff47: am 5338ff5d: am 65807544: am 0b198dc1: (-s ours) am 93eb5323: ↵Selim Gurun2014-01-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bbec32f9: (-s ours) am 01e44c2c: am 0c0ef268: am 05288bbc: am f18f8ac4: am 7719d6ca: DO NOT MERGE Do not let intents request viewing private browser files * commit '9200ff47f928c7a3755be9cead1a9724133c5ab7': DO NOT MERGE Do not let intents request viewing private browser files
| * | | | | | | | | | | | | | | am 5338ff5d: am 65807544: am 0b198dc1: (-s ours) am 93eb5323: am bbec32f9: ↵Selim Gurun2014-01-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 01e44c2c: am 0c0ef268: am 05288bbc: am f18f8ac4: am 7719d6ca: DO NOT MERGE Do not let intents request viewing private browser files * commit '5338ff5d5dd0d1d0380f091d8b544878e9e45c19': DO NOT MERGE Do not let intents request viewing private browser files
| | * | | | | | | | | | | | | | am 65807544: am 0b198dc1: (-s ours) am 93eb5323: am bbec32f9: (-s ours) am ↵Selim Gurun2014-01-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01e44c2c: am 0c0ef268: am 05288bbc: am f18f8ac4: am 7719d6ca: DO NOT MERGE Do not let intents request viewing private browser files * commit '65807544377db0f643fa67b7bcd26373b8801c42': DO NOT MERGE Do not let intents request viewing private browser files
| | | * | | | | | | | | | | | | am 0b198dc1: (-s ours) am 93eb5323: am bbec32f9: (-s ours) am 01e44c2c: am ↵Selim Gurun2014-01-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c0ef268: am 05288bbc: am f18f8ac4: am 7719d6ca: DO NOT MERGE Do not let intents request viewing private browser files * commit '0b198dc1836af04753ebeef424a9184b78dceec3': DO NOT MERGE Do not let intents request viewing private browser files
| | | | * | | | | | | | | | | | am 93eb5323: am bbec32f9: (-s ours) am 01e44c2c: am 0c0ef268: am 05288bbc: ↵Selim Gurun2014-01-150-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f18f8ac4: am 7719d6ca: DO NOT MERGE Do not let intents request viewing private browser files * commit '93eb5323dd110cacfff4392f0d313774ce5677a4': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | * | | | | | | | | | | am bbec32f9: (-s ours) am 01e44c2c: am 0c0ef268: am 05288bbc: am f18f8ac4: ↵Selim Gurun2014-01-150-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7719d6ca: DO NOT MERGE Do not let intents request viewing private browser files * commit 'bbec32f9857b18ce85c759b51f219bcc11b640b5': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | | * | | | | | | | | | am 01e44c2c: am 0c0ef268: am 05288bbc: am f18f8ac4: am 7719d6ca: DO NOT ↵Selim Gurun2014-01-150-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE Do not let intents request viewing private browser files * commit '01e44c2ca18d446958a136a7e47d0d33dbcdbc94': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | | | * | | | | | | | | am 0c0ef268: am 05288bbc: am f18f8ac4: am 7719d6ca: DO NOT MERGE Do not let ↵Selim Gurun2014-01-150-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intents request viewing private browser files * commit '0c0ef26823cbf8251d309f8f2d352cf7f110fb42': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | | | | * | | | | | | | am 05288bbc: am f18f8ac4: am 7719d6ca: DO NOT MERGE Do not let intents ↵Selim Gurun2014-01-150-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request viewing private browser files * commit '05288bbcba86cdf453e0eef9dacd2a076d079680': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | | | | | * | | | | | | am f18f8ac4: am 7719d6ca: DO NOT MERGE Do not let intents request viewing ↵Selim Gurun2014-01-150-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | private browser files * commit 'f18f8ac477f11dab503fc57c1fac122daa361ec0': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | | | | | | * | | | | | am 7719d6ca: DO NOT MERGE Do not let intents request viewing private browser ↵Selim Gurun2014-01-151-0/+7
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files * commit '7719d6ca3fd4079add8a9648838d99244a237eaf': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | | | | | | | * | | | | DO NOT MERGE Do not let intents request viewing private browser filesSelim Gurun2014-01-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9793586 Change-Id: I8f6f03b05556ee4d6846c15752de9be54c003060 (cherry picked from commit 348cca6c61e1ad3f2d580298d9ec5f1826f64269)
* | | | | | | | | | | | | | | | am 57ad4523: am 83ef6a06: am 42103687: am 9712e52a: (-s ours) am ce166d72: ↵Selim Gurun2014-01-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f450dfca: (-s ours) am 40c2b93e: am d5b4fe1a: am 816688be: DO NOT MERGE Do not let intents request viewing private browser files * commit '57ad45232c4d421bca3c5c94d69cd72e9a433689': DO NOT MERGE Do not let intents request viewing private browser files
| * | | | | | | | | | | | | | | am 83ef6a06: am 42103687: am 9712e52a: (-s ours) am ce166d72: am f450dfca: ↵Selim Gurun2014-01-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-s ours) am 40c2b93e: am d5b4fe1a: am 816688be: DO NOT MERGE Do not let intents request viewing private browser files * commit '83ef6a0698c599b5f02abb208d281f4a90aa6849': DO NOT MERGE Do not let intents request viewing private browser files
| | * | | | | | | | | | | | | | am 42103687: am 9712e52a: (-s ours) am ce166d72: am f450dfca: (-s ours) am ↵Selim Gurun2014-01-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40c2b93e: am d5b4fe1a: am 816688be: DO NOT MERGE Do not let intents request viewing private browser files * commit '42103687f2e2d57aa29301558404487686e6df50': DO NOT MERGE Do not let intents request viewing private browser files
| | | * | | | | | | | | | | | | am 9712e52a: (-s ours) am ce166d72: am f450dfca: (-s ours) am 40c2b93e: am ↵Selim Gurun2014-01-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5b4fe1a: am 816688be: DO NOT MERGE Do not let intents request viewing private browser files * commit '9712e52a5555e1fa9f814c0daefcbe97de211508': DO NOT MERGE Do not let intents request viewing private browser files
| | | | * | | | | | | | | | | | am ce166d72: am f450dfca: (-s ours) am 40c2b93e: am d5b4fe1a: am 816688be: ↵Selim Gurun2014-01-150-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Do not let intents request viewing private browser files * commit 'ce166d720f4ffecd396dfd56fdb1effecd6132db': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | * | | | | | | | | | | am f450dfca: (-s ours) am 40c2b93e: am d5b4fe1a: am 816688be: DO NOT MERGE ↵Selim Gurun2014-01-150-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not let intents request viewing private browser files * commit 'f450dfcadc218c3cbb81de642448a6c97e213677': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | | * | | | | | | | | | am 40c2b93e: am d5b4fe1a: am 816688be: DO NOT MERGE Do not let intents ↵Selim Gurun2014-01-151-0/+7
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request viewing private browser files * commit '40c2b93ef0128756bd1a3bb1d471ab515a181404': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | | | * | | | | | | | | am d5b4fe1a: am 816688be: DO NOT MERGE Do not let intents request viewing ↵Selim Gurun2014-01-151-0/+7
| | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | private browser files * commit 'd5b4fe1a50f07755cfa67ad80a5871019713b6a0': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | | | | * | | | | | | | am 816688be: DO NOT MERGE Do not let intents request viewing private browser ↵Selim Gurun2014-01-151-0/+7
| | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files * commit '816688be5d55974d05fb1dddac784bb36e0296bd': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | | | | | * | | | | | | DO NOT MERGE Do not let intents request viewing private browser filesSelim Gurun2014-01-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9793586 Change-Id: I8f6f03b05556ee4d6846c15752de9be54c003060 (cherry picked from commit 348cca6c61e1ad3f2d580298d9ec5f1826f64269)
* | | | | | | | | | | | | | | | am a6f30360: am c2ec310c: am 142fd813: am fe7ad2c5: (-s ours) am 00c67946: ↵Selim Gurun2014-01-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Do not let intents request viewing private browser files * commit 'a6f30360ce68b3bf97396bbbe7725cd273eae1c6': DO NOT MERGE Do not let intents request viewing private browser files
| * | | | | | | | | | | | | | | am c2ec310c: am 142fd813: am fe7ad2c5: (-s ours) am 00c67946: DO NOT MERGE ↵Selim Gurun2014-01-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not let intents request viewing private browser files * commit 'c2ec310cd5f0d2124420ea9ad3ffb50d0ea16753': DO NOT MERGE Do not let intents request viewing private browser files
| | * | | | | | | | | | | | | | am 142fd813: am fe7ad2c5: (-s ours) am 00c67946: DO NOT MERGE Do not let ↵Selim Gurun2014-01-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intents request viewing private browser files * commit '142fd813e33823c342fdec4496a1f121048f171a': DO NOT MERGE Do not let intents request viewing private browser files
| | | * | | | | | | | | | | | | am fe7ad2c5: (-s ours) am 00c67946: DO NOT MERGE Do not let intents request ↵Selim Gurun2014-01-150-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | viewing private browser files * commit 'fe7ad2c5d27df2a7a79c0a146533c3ecad05c974': DO NOT MERGE Do not let intents request viewing private browser files
| | | | * | | | | | | | | | | | am 00c67946: DO NOT MERGE Do not let intents request viewing private browser ↵Selim Gurun2014-01-151-0/+7
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | / | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files * commit '00c679463b20c4502393ecbe73b03b205fbc80c8': DO NOT MERGE Do not let intents request viewing private browser files
| | | | | * | | | | | | | | | DO NOT MERGE Do not let intents request viewing private browser filesSelim Gurun2014-01-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9793586 Change-Id: I8f6f03b05556ee4d6846c15752de9be54c003060 (cherry picked from commit 348cca6c61e1ad3f2d580298d9ec5f1826f64269)
* | | | | | | | | | | | | | | am 5676f076: am 59af0b0e: am 6d060463: DO NOT MERGE Do not let intents ↵Selim Gurun2014-01-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request viewing private browser files * commit '5676f076a453254170012c0c9da21e46712af89e': DO NOT MERGE Do not let intents request viewing private browser files
| * | | | | | | | | | | | | | am 59af0b0e: am 6d060463: DO NOT MERGE Do not let intents request viewing ↵Selim Gurun2014-01-151-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | private browser files * commit '59af0b0e891e4547a14546df873c27f3f3c698e1': DO NOT MERGE Do not let intents request viewing private browser files
| | * | | | | | | | | | | | | am 6d060463: DO NOT MERGE Do not let intents request viewing private browser ↵Selim Gurun2014-01-151-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files * commit '6d0604635e469298155da478a3ea53aaec0c109c': DO NOT MERGE Do not let intents request viewing private browser files
| | | * | | | | | | | | | | | DO NOT MERGE Do not let intents request viewing private browser filesSelim Gurun2014-01-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9793586 Change-Id: I8f6f03b05556ee4d6846c15752de9be54c003060 (cherry picked from commit 348cca6c61e1ad3f2d580298d9ec5f1826f64269)
* | | | | | | | | | | | | | | am c416fa25: am 0765ff79: am 0d49e161: Fix exception in Browser SettingsJonathan Dixon2014-01-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c416fa250b9ded2bdadb08da945d88043d23af1e':
| * | | | | | | | | | | | | | am 0765ff79: am 0d49e161: Fix exception in Browser SettingsJonathan Dixon2014-01-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0765ff79c7bf576d51058b1d26e9443a1b0700d5':
| | * | | | | | | | | | | | | am 0d49e161: Fix exception in Browser SettingsJonathan Dixon2014-01-151-0/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | / / / | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | * commit '0d49e161632661fbe4b16fd174acf401dec42e7a': Fix exception in Browser Settings