kmccormick
257719ec2a
am cccf6e9b: am 9f0ed0ee: am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
...
* commit 'cccf6e9b85e7f9e5f404137dde5dbd9db937592b':
Doc update: clarify dumpsys instructions
2013-03-29 16:18:40 -07:00
kmccormick
cccf6e9b85
am 9f0ed0ee: am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
...
* commit '9f0ed0ee508b8f2233c8834f067e2fb8275d2cfa':
Doc update: clarify dumpsys instructions
2013-03-29 16:16:10 -07:00
kmccormick
9f0ed0ee50
am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
...
* commit '58db95970c9ba47dd83e06cc165d2dc5cc29ce8a':
Doc update: clarify dumpsys instructions
2013-03-29 16:13:12 -07:00
kmccormick
58db95970c
am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
...
* commit 'e4ca0650eaad85ce5700ff99940c0acefed210bc':
Doc update: clarify dumpsys instructions
2013-03-29 16:11:48 -07:00
kmccormick
e4ca0650ea
am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
...
* commit '31ed1722b1e66211e7cbf55c2e9d55c1ce66b171':
Doc update: clarify dumpsys instructions
2013-03-29 16:09:26 -07:00
kmccormick
31ed1722b1
Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs
2013-03-29 23:06:58 +00:00
kmccormick
be1339edc4
am 328f7b71: am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
...
* commit '328f7b7160d4c5a30c6810cbcd4aa01bb7b57dda':
Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 16:04:09 -07:00
kmccormick
a92ca7fa3e
am a8858d21: am 93c4446a: am 75fa3012: am 18f76d62: am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
...
* commit 'a8858d215123b819557d130bfeeeb50568649b51':
Doc update: clarify guidelines for firewall setup.
2013-03-29 16:04:05 -07:00
kmccormick
328f7b7160
am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
...
* commit '90fa2ae28c200e0269f86f7d4e486ce781763a99':
Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 16:02:30 -07:00
kmccormick
a8858d2151
am 93c4446a: am 75fa3012: am 18f76d62: am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
...
* commit '93c4446af02b3ccf6da5f8bd7ecb4b8b1cdf62d5':
Doc update: clarify guidelines for firewall setup.
2013-03-29 16:02:27 -07:00
kmccormick
f6dc107809
Doc update: clarify dumpsys instructions
...
"Bug: 8474578"
Change-Id: Ic743de8f41a1b2d38a4d2495148dc07e2f45b8e5
2013-03-29 16:01:31 -07:00
kmccormick
90fa2ae28c
am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
...
* commit '23b55e78c86b09e806790d4f3ee47646216a9b87':
Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 16:00:06 -07:00
kmccormick
93c4446af0
am 75fa3012: am 18f76d62: am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
...
* commit '75fa3012467117933d6afb7353b1c027bd446b72':
Doc update: clarify guidelines for firewall setup.
2013-03-29 16:00:03 -07:00
Michael Wright
ee5880c95a
Merge "Finish any event in the current input queue" into jb-mr2-dev
2013-03-29 22:58:50 +00:00
kmccormick
23b55e78c8
am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
...
* commit '3fab60bddb4ae719185f884ad167e5f16eaa4314':
Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 15:57:32 -07:00
kmccormick
75fa301246
am 18f76d62: am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
...
* commit '18f76d621e001f6b717ac2519f374887fa620891':
Doc update: clarify guidelines for firewall setup.
2013-03-29 15:57:30 -07:00
kmccormick
3fab60bddb
am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
...
* commit '183c95e0c725d3f2f213d56cf98c24cf51dc848a':
Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 15:55:49 -07:00
kmccormick
18f76d621e
am a353a9f8: Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
...
* commit 'a353a9f83e654f1b10ceab98ef03a7607737de70':
Doc update: clarify guidelines for firewall setup.
2013-03-29 15:55:47 -07:00
kmccormick
183c95e0c7
Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
2013-03-29 22:53:04 +00:00
kmccormick
b04c07fb9b
Doc update: PlaybackCompleted valid state 4 pause
...
"Bug: 7962402"
Change-Id: Ie41d7085373794e98208d8815010b3ca1d81378c
2013-03-29 15:50:03 -07:00
kmccormick
a353a9f83e
Merge "Doc update: clarify guidelines for firewall setup." into jb-mr1.1-docs
2013-03-29 22:44:49 +00:00
kmccormick
b43fd58a10
Doc update: clarify guidelines for firewall setup.
...
Change-Id: Id3284bb21a0a2b612babf6cf582fda8f1c73cb80
2013-03-29 15:21:12 -07:00
kmccormick
da160ec313
am 6eebd6e6: am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
...
* commit '6eebd6e6b44d7688489c430cad933e971530e43d':
Doc update: incorrect method name
2013-03-29 14:51:25 -07:00
kmccormick
6eebd6e6b4
am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
...
* commit '6f50c846ad46dfeadf8eac389102031662ad892f':
Doc update: incorrect method name
2013-03-29 14:48:35 -07:00
kmccormick
6f50c846ad
am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
...
* commit 'd2c1e947ea27ccea8060b0ef4509b3d6c90c4c51':
Doc update: incorrect method name
2013-03-29 14:46:53 -07:00
kmccormick
d2c1e947ea
am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
...
* commit '39f864b18153768224f4e1b6a650dfa0a9312055':
Doc update: incorrect method name
2013-03-29 14:44:59 -07:00
kmccormick
39f864b181
am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs
...
* commit '5018688b69129a6d1c58167329df1b06dba23095':
Doc update: incorrect method name
2013-03-29 14:42:44 -07:00
kmccormick
5018688b69
Merge "Doc update: incorrect method name" into jb-mr1.1-docs
2013-03-29 21:38:49 +00:00
kmccormick
10d598a2bd
am ac1807ab: am acf47ca6: am da03abb6: am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
...
* commit 'ac1807ab1d90a531550ee07356c52fe05abae32d':
Doc update: obsolete ant target.
2013-03-29 14:38:19 -07:00
kmccormick
ac1807ab1d
am acf47ca6: am da03abb6: am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
...
* commit 'acf47ca6331f6e9576e9970ec8b657e068cc02cb':
Doc update: obsolete ant target.
2013-03-29 14:35:34 -07:00
kmccormick
f783ce5bcf
Doc update: incorrect method name
...
"Bug: 8177983"
Change-Id: Ib8f811a8e82dbff9b4e97cb670dec66342a0df00
2013-03-29 14:33:21 -07:00
kmccormick
acf47ca633
am da03abb6: am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
...
* commit 'da03abb635009e555fc00783084ce17d548fe08d':
Doc update: obsolete ant target.
2013-03-29 14:31:24 -07:00
kmccormick
da03abb635
am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
...
* commit 'addfe2bef1c84296188bf426e52e01bc62d49b9a':
Doc update: obsolete ant target.
2013-03-29 14:28:30 -07:00
kmccormick
addfe2bef1
am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
...
* commit 'd51a557ab662c868d2d28675234de8eaf1c675e6':
Doc update: obsolete ant target.
2013-03-29 14:25:44 -07:00
Kenny Root
b381772246
Merge "KeyStore: add API to query storage type" into jb-mr2-dev
2013-03-29 21:24:35 +00:00
kmccormick
d51a557ab6
Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
2013-03-29 21:23:02 +00:00
Kenny Root
5cb5cec6a4
KeyStore: add API to query storage type
...
Add an API to keystore daemon to query what kind of storage is currently
in use.
(cherry picked from commit a738e2a1aee26e0be3944c11820724aeca313f83)
Change-Id: I52c84449a27b1cefc49372a6406b7132c2bbddee
2013-03-29 14:21:10 -07:00
kmccormick
0525c09bc0
am 138ad7ba: am a80a7164: am 859a4301: am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
...
* commit '138ad7ba1b59f6105d1f79966e616f5970970ef3':
Doc update: typos in code snippets.
2013-03-29 14:18:12 -07:00
kmccormick
138ad7ba1b
am a80a7164: am 859a4301: am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
...
* commit 'a80a71648ac9cb306007e67afbc4bedb4debf899':
Doc update: typos in code snippets.
2013-03-29 14:15:43 -07:00
kmccormick
36b8beec20
Doc update: obsolete ant target.
...
"Bug: 8435577"
Change-Id: Iaec80cef09f70ccc5d0421b4d2d9a16ada0bd12d
2013-03-29 14:15:10 -07:00
kmccormick
a80a71648a
am 859a4301: am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
...
* commit '859a4301d83bf894ffd79e4f3d8abf82ce1143c5':
Doc update: typos in code snippets.
2013-03-29 14:12:44 -07:00
kmccormick
859a4301d8
am 4e259b2c: am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
...
* commit '4e259b2cde9cc028fbaddcd650934b6d422e0dff':
Doc update: typos in code snippets.
2013-03-29 14:10:16 -07:00
kmccormick
4e259b2cde
am 0e6691be: Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
...
* commit '0e6691be2abbc11af2d50f1dfdebf3f11285993d':
Doc update: typos in code snippets.
2013-03-29 14:07:54 -07:00
Michael Wright
bf02096088
Finish any event in the current input queue
...
When the pipelining optimization was added we never updated
handleImeFinishedEvent to look through the whole queue of items, so it was only
looking at the head.
Bug: 8498214
Change-Id: I79c62392a93b47e3e1eab3f4fe54a5c999dfb566
2013-03-29 14:06:43 -07:00
kmccormick
0e6691be2a
Merge "Doc update: typos in code snippets." into jb-mr1.1-docs
2013-03-29 21:05:00 +00:00
kmccormick
741b2f20a1
Doc update: typos in code snippets.
...
"Bug: 8475026"
Change-Id: If516a2a6c6416f1fb10c0d4f0c94bd5e849e0cc9
2013-03-29 14:03:20 -07:00
kmccormick
da58f7f1c3
am d80f5809: am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit 'd80f58095b5b1358c40c9bdf50afceaaa7ce87e5':
Doc update: emulator bug fix
2013-03-29 13:57:22 -07:00
kmccormick
d80f58095b
am 7c805a0e: am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit '7c805a0e0eb42244438c83678f103c4bb7071a4b':
Doc update: emulator bug fix
2013-03-29 13:56:05 -07:00
kmccormick
7c805a0e0e
am 404eb8d3: am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit '404eb8d36a2e6ebea3f16ad1e013423f7f1d4d13':
Doc update: emulator bug fix
2013-03-29 13:54:15 -07:00
kmccormick
404eb8d36a
am a243e162: am 82a42a25: Merge "Doc update: emulator bug fix" into jb-mr1.1-docs
...
* commit 'a243e162542cd4dcfc3ffd7b46b111efe402972f':
Doc update: emulator bug fix
2013-03-29 13:51:07 -07:00
