111924 Commits

Author SHA1 Message Date
Baligh Uddin
6e5543ccba Merge "Import translations. DO NOT MERGE" 2013-08-28 03:16:49 +00:00
Baligh Uddin
086e3ed72a Merge "Import translations. DO NOT MERGE" 2013-08-28 02:33:51 +00:00
Zhijun He
b51422f430 am 525319cd: am 5b6ce5a2: Merge "ImageReader: Fix null listener case" into klp-dev
* commit '525319cd22908eed75a4f8a675118c8bdffa19c3':
  ImageReader: Fix null listener case
2013-08-27 19:28:52 -07:00
Zhijun He
525319cd22 am 5b6ce5a2: Merge "ImageReader: Fix null listener case" into klp-dev
* commit '5b6ce5a2921caa63481630f877356e5678ee9ffa':
  ImageReader: Fix null listener case
2013-08-27 19:24:59 -07:00
Zhijun He
5b6ce5a292 Merge "ImageReader: Fix null listener case" into klp-dev 2013-08-28 02:22:37 +00:00
John Spurlock
0ad6b3935a am fee8a471: am ae73139f: Merge "Remove unreferenced assets from SystemUI." into klp-dev
* commit 'fee8a471650ea53efa80e45e3e26e8c2abf870b8':
  Remove unreferenced assets from SystemUI.
2013-08-27 18:32:59 -07:00
John Spurlock
fee8a47165 am ae73139f: Merge "Remove unreferenced assets from SystemUI." into klp-dev
* commit 'ae73139f37a34cb4cc51255cc15cd19fbc11416a':
  Remove unreferenced assets from SystemUI.
2013-08-27 18:31:34 -07:00
John Spurlock
ae73139f37 Merge "Remove unreferenced assets from SystemUI." into klp-dev 2013-08-28 01:26:13 +00:00
Jeff Hao
6fe26a267e am 896e5d75: am 09944b04: am 6b34ab3f: Merge "Merge MPSE and SPSE Chunk handlers for ddms."
* commit '896e5d758722caf97f6e09769e51d1279d15560c':
  Merge MPSE and SPSE Chunk handlers for ddms.
2013-08-27 18:26:06 -07:00
Jeff Hao
79445df0cc am f46f8431: (-s ours) am 5d21168b: am 366291e2: Merge "Add frameworks support for sample profiling from traceview gui."
* commit 'f46f843171e963a7869cc0f1d37974096688e014':
  Add frameworks support for sample profiling from traceview gui.
2013-08-27 18:26:04 -07:00
Jeff Hao
896e5d7587 am 09944b04: am 6b34ab3f: Merge "Merge MPSE and SPSE Chunk handlers for ddms."
* commit '09944b04fa29eca7f889413988a05a268a5521f5':
  Merge MPSE and SPSE Chunk handlers for ddms.
2013-08-27 18:21:27 -07:00
Jeff Hao
f46f843171 am 5d21168b: am 366291e2: Merge "Add frameworks support for sample profiling from traceview gui."
* commit '5d21168bb4b33fb5eb8770996895a729880c7dbc':
  Add frameworks support for sample profiling from traceview gui.
2013-08-27 18:21:23 -07:00
Jeff Hao
09944b04fa am 6b34ab3f: Merge "Merge MPSE and SPSE Chunk handlers for ddms."
* commit '6b34ab3f1aafc3143c71e342b7a9f5a6ddfeabb4':
  Merge MPSE and SPSE Chunk handlers for ddms.
2013-08-27 18:18:47 -07:00
Jeff Hao
5d21168bb4 am 366291e2: Merge "Add frameworks support for sample profiling from traceview gui."
* commit '366291e2830b96268458dd6c5b15412e46d93145':
  Add frameworks support for sample profiling from traceview gui.
2013-08-27 18:18:43 -07:00
Jeff Hao
6b34ab3f1a Merge "Merge MPSE and SPSE Chunk handlers for ddms." 2013-08-28 01:14:26 +00:00
Jeff Hao
366291e283 Merge "Add frameworks support for sample profiling from traceview gui." 2013-08-28 01:14:20 +00:00
Jeff Hao
6c7bac69f5 Merge MPSE and SPSE Chunk handlers for ddms.
(cherry picked from commit fd224b97797dfb7e3ee1e2f56c3109d1594cf040)

Change-Id: I1dab7801d47f092259916c4aea19b20d17951c2f
2013-08-27 17:59:32 -07:00
Baligh Uddin
022e26832a am 22636af2: (-s ours) am ef800067: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '22636af2eec3ea62647ff752d0db456cbbf8e440':
  Import translations. DO NOT MERGE
2013-08-27 17:51:16 -07:00
Baligh Uddin
e59a75eb38 am 23ca56fc: (-s ours) am c513608d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '23ca56fc8d7488d05a47f3dc0dbca41ea4f6853d':
  Import translations. DO NOT MERGE
2013-08-27 17:51:13 -07:00
Baligh Uddin
751426eccf am d0ed5853: (-s ours) am 397c7aaf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'd0ed585368ccfa2438ffc0fedc9ff48664a2a249':
  Import translations. DO NOT MERGE
2013-08-27 17:51:09 -07:00
Baligh Uddin
22636af2ee am ef800067: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ef8000670e0a61085572eeb8ee9115cecebb73a7':
  Import translations. DO NOT MERGE
2013-08-27 17:49:14 -07:00
Jeff Hao
ffee626c3a Add frameworks support for sample profiling from traceview gui.
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)

Change-Id: Ic193ddadf01c42905fc7c35a1a8bf89fba4556e9
2013-08-27 17:46:18 -07:00
Baligh Uddin
00bcd87091 Merge "Import translations. DO NOT MERGE" 2013-08-28 00:46:15 +00:00
Baligh Uddin
ef8000670e Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-28 00:45:47 +00:00
Baligh Uddin
23ca56fc8d am c513608d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c513608dc1944ec8c6578110e47dc60fc9fda4e1':
  Import translations. DO NOT MERGE
2013-08-27 17:45:45 -07:00
Baligh Uddin
d0ed585368 am 397c7aaf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '397c7aaf8d9a888727f3d1f54282420ee4f830d3':
  Import translations. DO NOT MERGE
2013-08-27 17:45:42 -07:00
Baligh Uddin
aed823e743 Merge "Import translations. DO NOT MERGE" 2013-08-28 00:45:29 +00:00
Baligh Uddin
10a11d9186 Merge "Import translations. DO NOT MERGE" 2013-08-28 00:45:07 +00:00
Baligh Uddin
b49ebe203e Merge "Import translations. DO NOT MERGE" 2013-08-28 00:43:05 +00:00
Baligh Uddin
c513608dc1 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-28 00:42:58 +00:00
Baligh Uddin
bcc057ef03 Merge "Import translations. DO NOT MERGE" 2013-08-28 00:42:41 +00:00
Baligh Uddin
397c7aaf8d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-28 00:42:36 +00:00
Baligh Uddin
aa00afb70f Merge "Import translations. DO NOT MERGE" 2013-08-28 00:42:12 +00:00
Baligh Uddin
bcc2069e4a Merge "Import translations. DO NOT MERGE" 2013-08-28 00:41:46 +00:00
Baligh Uddin
01df13d1d5 Merge "Import translations. DO NOT MERGE" 2013-08-28 00:41:41 +00:00
Svetoslav Ganov
6e59536da2 am 39149ff6: am ca09dbc6: Merge "Print APIs update." into klp-dev
* commit '39149ff6be57cb8b862aa4389609800fd111ec7b':
  Print APIs update.
2013-08-27 17:12:10 -07:00
Svetoslav Ganov
39149ff6be am ca09dbc6: Merge "Print APIs update." into klp-dev
* commit 'ca09dbc67b28d5d1d16b7966b855229697c6c549':
  Print APIs update.
2013-08-27 17:10:10 -07:00
Svetoslav Ganov
ca09dbc67b Merge "Print APIs update." into klp-dev 2013-08-28 00:07:09 +00:00
Martijn Coenen
ef97ba1958 am 61fdf6d1: am bbbc8660: Merge "Add NFC reader-mode API." into klp-dev
* commit '61fdf6d155a4fad1d27a7593618d29f638ea9f6a':
  Add NFC reader-mode API.
2013-08-27 16:14:59 -07:00
Martijn Coenen
61fdf6d155 am bbbc8660: Merge "Add NFC reader-mode API." into klp-dev
* commit 'bbbc8660cdbfb033291f1911742a942a42c85af0':
  Add NFC reader-mode API.
2013-08-27 16:11:32 -07:00
Martijn Coenen
bbbc8660cd Merge "Add NFC reader-mode API." into klp-dev 2013-08-27 23:08:56 +00:00
Zhijun He
e2a11bb74d ImageReader: Fix null listener case
Only do the handler check when listener is not null.

Bug: 10360518
Change-Id: I9940942ae95a492c92e028e5f862beea16e1da80
2013-08-27 16:02:21 -07:00
Alan Viverette
9d345ff4cb am 5c5fbb39: am 3d1b3cb9: Merge "Add documentation to onTouchEvent for accessibility" into klp-dev
* commit '5c5fbb39ec7c2ee51ad2b74c9c4604bb575bb6f7':
  Add documentation to onTouchEvent for accessibility
2013-08-27 15:55:58 -07:00
Alan Viverette
5c5fbb39ec am 3d1b3cb9: Merge "Add documentation to onTouchEvent for accessibility" into klp-dev
* commit '3d1b3cb9d9ea206d4244ed369224faf4d859973e':
  Add documentation to onTouchEvent for accessibility
2013-08-27 15:52:50 -07:00
Sreeram Ramachandran
659b7179d4 am 3175f08e: am d8d4c51e: Merge "Fix channel set option in wifi batch scan command." into klp-dev
* commit '3175f08ecb2e981504a0917f8c0ec469e0fe4074':
  Fix channel set option in wifi batch scan command.
2013-08-27 15:52:31 -07:00
Sreeram Ramachandran
3175f08ecb am d8d4c51e: Merge "Fix channel set option in wifi batch scan command." into klp-dev
* commit 'd8d4c51e3b966b9eaff391f736c716343984e79b':
  Fix channel set option in wifi batch scan command.
2013-08-27 15:49:25 -07:00
Alan Viverette
3d1b3cb9d9 Merge "Add documentation to onTouchEvent for accessibility" into klp-dev 2013-08-27 22:48:03 +00:00
Sreeram Ramachandran
d8d4c51e3b Merge "Fix channel set option in wifi batch scan command." into klp-dev 2013-08-27 22:45:30 +00:00
Jeff Hao
78da49f4bc Merge MPSE and SPSE Chunk handlers for ddms.
Change-Id: Ic25d31ee16f65a638ecb8957636ebfdb9beb4eb7
(cherry picked from commit fd224b97797dfb7e3ee1e2f56c3109d1594cf040)
2013-08-27 22:37:58 +00:00
Jeff Hao
55de3f5442 Merge "Add frameworks support for sample profiling from traceview gui." 2013-08-27 22:17:40 +00:00