Geremy Condra
9765f94ce7
Fix crash in ConfigUpdater when the target dir doesn't exist.
...
Change-Id: I44ee0e3791938da0bf890fb38cd886330c0ee01d
2013-04-04 17:48:09 -07:00
Jeff Sharkey
5c1994eeff
am 04e740a6: am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev
...
* commit '04e740a65e2399c4a4b211408bd84f2d545d9f4a':
Warn when exposing file:// Uris beyond a process.
2013-04-03 16:33:52 -07:00
Nick Kralevich
997af33eb1
am 26bb9c95: am 0d17aaa5: Merge "Grant optional permissions by default for system apps." into jb-mr2-dev
...
* commit '26bb9c955158893f946bed727124d3dbd3cfd0a7':
Grant optional permissions by default for system apps.
2013-04-03 16:33:49 -07:00
Jeff Sharkey
04e740a65e
am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev
...
* commit '0f8e8b03ebb35040c299079adc1c351f37ce4885':
Warn when exposing file:// Uris beyond a process.
2013-04-03 16:29:55 -07:00
Nick Kralevich
26bb9c9551
am 0d17aaa5: Merge "Grant optional permissions by default for system apps." into jb-mr2-dev
...
* commit '0d17aaa543f393c6c792f0b0d8ec5cb38ff1f71e':
Grant optional permissions by default for system apps.
2013-04-03 16:29:53 -07:00
Jeff Sharkey
0f8e8b03eb
Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev
2013-04-03 23:28:07 +00:00
Nick Kralevich
0d17aaa543
Merge "Grant optional permissions by default for system apps." into jb-mr2-dev
2013-04-03 23:26:28 +00:00
Nick Kralevich
60792852c8
Grant optional permissions by default for system apps.
...
For pre-installed system apps, automatically grant all optional
permissions.
Change-Id: I99bb320a0bbaa9873baeb63655556fe0fae6f011
2013-04-03 16:17:06 -07:00
Jean-Baptiste Queru
40a534bd87
am aaa46cfa: resolved conflicts for merge of 9ce89835 to jb-mr2-dev-plus-aosp
...
* commit 'aaa46cfa3d3956b726c231d51092720e78e6e1a7':
Update list of all audio files.
2013-04-03 16:15:57 -07:00
Jean-Baptiste Queru
aaa46cfa3d
resolved conflicts for merge of 9ce89835 to jb-mr2-dev-plus-aosp
...
Change-Id: Iabb769874d61fdb12d70d69518930dc81b7633b3
2013-04-03 16:00:44 -07:00
kmccormick
03dcece6a6
am 87b30e8e: am f81e4b47: am 43644aa1: am 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs
...
* commit '87b30e8e04b4c73efd27c5a261b4d8fcdccb3052':
Doc update: it's -> its
2013-04-03 15:37:57 -07:00
Jean-Baptiste Queru
9ce89835da
Update list of all audio files.
...
This adds a script that can generate the list from the other
makefiles.
This also regenerates the list.
Bug: 6336895
Change-Id: If1546c4a3f5b1f0d7c3ca79d29383e9843b2a89d
2013-04-03 15:36:52 -07:00
kmccormick
87b30e8e04
am f81e4b47: am 43644aa1: am 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs
...
* commit 'f81e4b4745c8fc8184fa84e3ce8ed66b92b61f49':
Doc update: it's -> its
2013-04-03 15:34:24 -07:00
kmccormick
f81e4b4745
am 43644aa1: am 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs
...
* commit '43644aa1ead4e5219cff8a81f0818265b2b1eb28':
Doc update: it's -> its
2013-04-03 15:31:00 -07:00
kmccormick
43644aa1ea
am 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs
...
* commit '23af4fffba3c9638d3fb7ffbaa50b09b510fd568':
Doc update: it's -> its
2013-04-03 15:28:04 -07:00
Jean-Baptiste Queru
ffa69dc2d0
am 568a954e: am 5e98dfee: Merge "Update list of all audio files."
...
* commit '568a954e27a2f7cb8427f3ead4bff29e7b2c6874':
Update list of all audio files.
2013-04-03 15:28:01 -07:00
Jean-Baptiste Queru
568a954e27
am 5e98dfee: Merge "Update list of all audio files."
...
* commit '5e98dfee848795a47d59455a7da35e04b48b1900':
Update list of all audio files.
2013-04-03 15:25:44 -07:00
kmccormick
23af4fffba
am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs
...
* commit '3f000e58af4d8da4fd62feab28424a8eac9434ec':
Doc update: it's -> its
2013-04-03 15:24:53 -07:00
kmccormick
3f000e58af
am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs
...
* commit '82c01b09c8b0db759a3271e5b20e1a565491e3b7':
Doc update: it's -> its
2013-04-03 15:22:02 -07:00
kmccormick
82c01b09c8
am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs
...
* commit '28cb20241bd3a31957cb034dc586eadee002ffbc':
Doc update: it's -> its
2013-04-03 15:18:54 -07:00
Jean-Baptiste Queru
5e98dfee84
Merge "Update list of all audio files."
2013-04-03 22:15:10 +00:00
kmccormick
28cb20241b
Merge "Doc update: it's -> its" into jb-mr1.1-docs
2013-04-03 22:14:30 +00:00
kmccormick
b9dceb8582
Doc update: it's -> its
...
"Bug: 7738685"
Change-Id: I70b1354afeb5fc7a5801d3ad22866f21ae25c1ae
2013-04-03 15:11:53 -07:00
Matthew Xie
be96b634dd
am afa72ed8: am 599efc3a: Merge "Fix minor LE descriptor permissions issue" into jb-mr2-dev
...
* commit 'afa72ed8b8be8652303dedbf8f1c114ef9903071':
Fix minor LE descriptor permissions issue
2013-04-03 15:08:29 -07:00
kmccormick
c5c6cc2da1
am 8d58f213: am 205d380b: am 9da4bde4: am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
...
* commit '8d58f213d337c20e782738bda021e1076973b68d':
Doc update: add links to maps docs
2013-04-03 15:08:25 -07:00
kmccormick
b471da283e
am b85e328d: am bbcf0852: am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit 'b85e328d380f3cd992302d3d36fbdce454990e64':
Doc update: fix broken code sample
2013-04-03 15:03:53 -07:00
Matthew Xie
afa72ed8b8
am 599efc3a: Merge "Fix minor LE descriptor permissions issue" into jb-mr2-dev
...
* commit '599efc3aa34351e02bfa6e8b9e3fd530b8d9c632':
Fix minor LE descriptor permissions issue
2013-04-03 15:02:49 -07:00
kmccormick
8d58f213d3
am 205d380b: am 9da4bde4: am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
...
* commit '205d380bdc69ade94dcc05f54dedbf186783cfb3':
Doc update: add links to maps docs
2013-04-03 15:02:45 -07:00
Matthew Xie
599efc3aa3
Merge "Fix minor LE descriptor permissions issue" into jb-mr2-dev
2013-04-03 22:00:07 +00:00
kmccormick
205d380bdc
am 9da4bde4: am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
...
* commit '9da4bde42329fe6c03d2eb4617f91892002e4460':
Doc update: add links to maps docs
2013-04-03 14:59:12 -07:00
Jean-Michel Trivi
314b25d0fd
resolved conflicts for merge of ca762bee to master
...
Change-Id: Ib57124c30352b4f6ed66f384b386eb6f49b505c1
2013-04-03 14:58:48 -07:00
kmccormick
9da4bde423
am 4b846e0d: am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
...
* commit '4b846e0d8192067dd7dbe371c5e1e49cd9e3d80f':
Doc update: add links to maps docs
2013-04-03 14:54:32 -07:00
Andre Eisenbach
6f0ed128e4
Fix minor LE descriptor permissions issue
...
Change-Id: Idded482a08f17a1373adf3e3a51709ff585d4f24
2013-04-03 14:54:12 -07:00
kmccormick
4b846e0d81
am 322ba0d4: am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
...
* commit '322ba0d403ca063c1374d48c5a6717a585052abf':
Doc update: add links to maps docs
2013-04-03 14:50:32 -07:00
kmccormick
322ba0d403
am a0907a12: am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
...
* commit 'a0907a1278c7ce568baabb3a4b1e2e9f83e18a09':
Doc update: add links to maps docs
2013-04-03 14:47:14 -07:00
Jean-Baptiste Queru
1c4c864a0b
Update list of all audio files.
...
This adds a script that can generate the list from the other
makefiles.
This also regenerates the list.
Bug: 6336895
Change-Id: If1546c4a3f5b1f0d7c3ca79d29383e9843b2a89d
2013-04-03 14:47:14 -07:00
kmccormick
a0907a1278
am edbe6e13: Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
...
* commit 'edbe6e134846d2a01378497dca42b47be7e7292b':
Doc update: add links to maps docs
2013-04-03 14:43:37 -07:00
kmccormick
edbe6e1348
Merge "Doc update: add links to maps docs" into jb-mr1.1-docs
2013-04-03 21:39:43 +00:00
kmccormick
b85e328d38
am bbcf0852: am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit 'bbcf0852f786ea1c9cf6dca85f45487b7739bfab':
Doc update: fix broken code sample
2013-04-03 14:34:07 -07:00
kmccormick
d056e62b19
Doc update: add links to maps docs
...
"Bug: 8090710"
Change-Id: I76b0a099dc41fca09300ea6530ea1bcc5f553da4
2013-04-03 14:30:31 -07:00
kmccormick
bbcf0852f7
am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit '9d9365916def1a60d98cab7d59a4c98d9e7f6f42':
Doc update: fix broken code sample
2013-04-03 14:30:09 -07:00
kmccormick
9d9365916d
am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit 'f57266175dffe68c5709f432dd6983c314d164f4':
Doc update: fix broken code sample
2013-04-03 14:26:34 -07:00
kmccormick
f57266175d
am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit '2144eee3576e3fb382170f502e41f1aae572559a':
Doc update: fix broken code sample
2013-04-03 14:23:54 -07:00
kmccormick
2144eee357
am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit '3fb5536d625a070be712aa817705b93b262e3f8c':
Doc update: fix broken code sample
2013-04-03 14:21:10 -07:00
kmccormick
3fb5536d62
am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
...
* commit '91e01a4d2ee09a1a6a226302cd6d524a1c96070f':
Doc update: fix broken code sample
2013-04-03 14:18:56 -07:00
kmccormick
91e01a4d2e
Merge "Doc update: fix broken code sample" into jb-mr1.1-docs
2013-04-03 21:16:08 +00:00
Jean-Michel Trivi
ca762beea4
am 6a570204: Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev
...
* commit '6a5702041f48f868863a0454d7df6cd64eab235d':
RemoteControlClient receives playback position change requests
2013-04-03 14:14:49 -07:00
kmccormick
e4ce502d77
Doc update: fix broken code sample
...
"Bug: 8537853"
Change-Id: Ieedfd24c39725ce7c6975300b6471ab3ef5884ee
2013-04-03 14:13:36 -07:00
Ying Wang
490b579123
am d472ad74: Merge branch \'jb-mr2-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr2-dev-plus-aosp
...
* commit 'd472ad742732e4e81c33f191bcecf8567605ab86':
Doc update: clean up ubiquitous typo "the the"
2013-04-03 14:12:30 -07:00
Brian Carlstrom
96242a1b17
am 3c7df09d: am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."
...
* commit '3c7df09d4dd00fb23da888726182f00788957cd9':
Adjust the HttpResponseCache for OkHttp.
2013-04-03 14:12:27 -07:00
