Jeff Brown
b631eda39c
am cf4339a8: am acad301a: Merge "Update media route picker button assets." into jb-mr2-dev
...
* commit 'cf4339a8093f2497437ec4bb8a9ef4a1c279c279':
Update media route picker button assets.
2013-05-21 11:43:43 -07:00
Jeff Brown
cf4339a809
am acad301a: Merge "Update media route picker button assets." into jb-mr2-dev
...
* commit 'acad301ae7f7d950aa54526c379d0ca605f180ca':
Update media route picker button assets.
2013-05-21 11:39:43 -07:00
Jeff Brown
acad301ae7
Merge "Update media route picker button assets." into jb-mr2-dev
2013-05-21 18:37:07 +00:00
Romain Guy
49f2e4098d
Merge "Destroy display lists when running complete memory trims Bug #8833153 "
2013-05-21 18:25:14 +00:00
Jay Shrauner
049219925f
am 66d67241: am 34bed420: Merge "Update CALL_PRIVILEGED docs" into jb-mr2-dev
...
* commit '66d67241205e857e434bacf1a1e8fb8e3100018d':
Update CALL_PRIVILEGED docs
2013-05-21 11:06:05 -07:00
Jay Shrauner
66d6724120
am 34bed420: Merge "Update CALL_PRIVILEGED docs" into jb-mr2-dev
...
* commit '34bed4206750eadd69737274dc641b2d1444af3f':
Update CALL_PRIVILEGED docs
2013-05-21 11:02:33 -07:00
Jay Shrauner
34bed42067
Merge "Update CALL_PRIVILEGED docs" into jb-mr2-dev
2013-05-21 17:59:25 +00:00
Dianne Hackborn
01549b001e
Merge "Fix build."
2013-05-21 17:48:32 +00:00
Dianne Hackborn
19849d3c9a
Fix build.
...
Change-Id: I3dc503a3cd30276ac10582db44732d96b68230ee
2013-05-21 10:47:17 -07:00
Daniel Sandler
75c501747e
am 99d1f7f4: am f5ceaf4b: Merge "Archive a copy of each dismissed notification." into jb-mr2-dev
...
* commit '99d1f7f41e79157ca61b14a1d61d29b5f51efc73':
Archive a copy of each dismissed notification.
2013-05-21 10:39:02 -07:00
Daniel Sandler
99d1f7f41e
am f5ceaf4b: Merge "Archive a copy of each dismissed notification." into jb-mr2-dev
...
* commit 'f5ceaf4b19362b3cf7882bf8a6d086841f551fed':
Archive a copy of each dismissed notification.
2013-05-21 10:37:27 -07:00
Daniel Sandler
f5ceaf4b19
Merge "Archive a copy of each dismissed notification." into jb-mr2-dev
2013-05-21 17:35:17 +00:00
Dirk Dougherty
1a83199666
am 136300bc: am d258b1ef: am 2d31a8e8: am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
...
* commit '136300bc65bd35b5b87fed1c494aea7c97c9117e':
Doc change: fix doc title.
2013-05-21 10:25:57 -07:00
Dirk Dougherty
136300bc65
am d258b1ef: am 2d31a8e8: am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
...
* commit 'd258b1efe7717272c1e615fbe7884a93de198018':
Doc change: fix doc title.
2013-05-21 10:23:23 -07:00
Dirk Dougherty
d258b1efe7
am 2d31a8e8: am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
...
* commit '2d31a8e85ca9e10c1dca720e89f2caa15dfd6e45':
Doc change: fix doc title.
2013-05-21 10:21:34 -07:00
Scott Main
974cfa1a5b
am d16004af: am dad413d0: am c7785844: am e6fbd9ed: am 86c25dec: add search tag for swipe view lesson
...
* commit 'd16004af9c71bfd2d0da9ec58e1a50e748b1bd62':
add search tag for swipe view lesson
2013-05-21 10:20:59 -07:00
Dirk Dougherty
2d31a8e85c
am a3d5a7a9: am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
...
* commit 'a3d5a7a90fc9029e82e9e5cb64e789854ef99506':
Doc change: fix doc title.
2013-05-21 10:19:39 -07:00
Scott Main
d16004af9c
am dad413d0: am c7785844: am e6fbd9ed: am 86c25dec: add search tag for swipe view lesson
...
* commit 'dad413d01e08bcd5b709b438a4780a1956c7673e':
add search tag for swipe view lesson
2013-05-21 10:17:46 -07:00
Scott Main
dad413d01e
am c7785844: am e6fbd9ed: am 86c25dec: add search tag for swipe view lesson
...
* commit 'c778584443cfb3af5a4f449959e16997edede266':
add search tag for swipe view lesson
2013-05-21 10:15:36 -07:00
Dirk Dougherty
a3d5a7a90f
am 0269b3dd: am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
...
* commit '0269b3dde009650192a3a746929e5f4c8b54e0c2':
Doc change: fix doc title.
2013-05-21 10:14:58 -07:00
Scott Main
c778584443
am e6fbd9ed: am 86c25dec: add search tag for swipe view lesson
...
* commit 'e6fbd9ed6f9bda28d1279d4b762d8f0ab885ab47':
add search tag for swipe view lesson
2013-05-21 10:14:03 -07:00
Dirk Dougherty
0269b3dde0
am 6a4214f0: am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
...
* commit '6a4214f065d05e9ec0480929c2ed800d0e3a86f8':
Doc change: fix doc title.
2013-05-21 10:12:55 -07:00
Scott Main
e6fbd9ed6f
am 86c25dec: add search tag for swipe view lesson
...
* commit '86c25decc05bcf9f3085ccbcfb18e31d6d010970':
add search tag for swipe view lesson
2013-05-21 10:11:41 -07:00
Dirk Dougherty
6a4214f065
am a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
...
* commit 'a963459e3f96f2b27d87e3fccdfa8fb98f0f9ab6':
Doc change: fix doc title.
2013-05-21 10:07:03 -07:00
Dirk Dougherty
a963459e3f
Merge "Doc change: fix doc title." into jb-mr1.1-docs
2013-05-21 17:05:08 +00:00
Dirk Dougherty
07340d636d
Doc change: fix doc title.
...
Change-Id: I2303ef05df89780ab3fa396b248097ea1115bb05
2013-05-21 10:03:35 -07:00
The Android Open Source Project
d72c371346
am e4753307: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'e47533071890836aa1fce70c4e6fb0582d6de5cf':
Do not report the fake UI automation service to clients.
Add a time margin for deferred enable.
Taking into account data change for AbsListView when prefetching node infos.
Fix off-by-1 error in timing
2013-05-21 09:02:30 -07:00
The Android Open Source Project
e475330718
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I78fc7efc6eaaf9cba14f30d83be55ef494804de0
2013-05-21 08:59:00 -07:00
The Android Automerger
a348cc55bf
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-21 07:46:48 -07:00
Przemyslaw Szczepaniak
40d51e7003
Make TtsEngines.getDefaultLocale() method public
...
TtsEngines is hidden class, it's not a public API.
It's required for tracking system language setting by TTS engines
(Change: Ic4bde97ef7406adb64cc03efbe660275360ba3af )
Bug: 8613986
Change-Id: Iafafcdb244e1520893bee65febd5a137e3556317
2013-05-21 12:29:28 +00:00
Scott Main
7fb27f74ce
am 0000e1c8: am b59cf565: am e205386e: am 66e965dd: am 2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev
...
* commit '0000e1c82e630fbda525619d837beec065a950bf':
delete orphaned and obsolete files
2013-05-21 02:36:23 -07:00
Dirk Dougherty
e9114f73d9
am 21bb5ccd: am 9fca910b: am 807582cb: am 45e87f4e: am 0775c1ba: am b3d79b44: am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs
...
* commit '21bb5ccd433820bebb2263decf85ef8a402c1e47':
Doc change: fix tiny url.
2013-05-21 02:36:19 -07:00
Scott Main
0000e1c82e
am b59cf565: am e205386e: am 66e965dd: am 2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev
...
* commit 'b59cf5659da6279a977282fc39c0c2c3a3dd9f37':
delete orphaned and obsolete files
2013-05-21 02:33:44 -07:00
Dirk Dougherty
21bb5ccd43
am 9fca910b: am 807582cb: am 45e87f4e: am 0775c1ba: am b3d79b44: am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs
...
* commit '9fca910be71fb50f45a29b8348cd75e6b23f8c8b':
Doc change: fix tiny url.
2013-05-21 02:33:42 -07:00
Scott Main
b59cf5659d
am e205386e: am 66e965dd: am 2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev
...
* commit 'e205386e1ef1364977fe9c0aeb5bf0d6dbe0fd44':
delete orphaned and obsolete files
2013-05-21 02:31:16 -07:00
Dirk Dougherty
9fca910be7
am 807582cb: am 45e87f4e: am 0775c1ba: am b3d79b44: am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs
...
* commit '807582cbb97d8c2173caaf40d6234e9435734f8a':
Doc change: fix tiny url.
2013-05-21 02:31:12 -07:00
Brett Chabot
2251059ee1
Merge "Build native libinput tests using BUILD_NATIVE_TESTS"
2013-05-21 05:00:30 +00:00
Daniel Sandler
26b81d594c
Archive a copy of each dismissed notification.
...
We don't want to save all the heavyweight stuff, but we
can't lighten the notification in place because there may be
other active references.
Bug: 8839246
Change-Id: Id6dcc1cf5ae196ee3e42908d6b3ec4e928e9f0c5
2013-05-21 00:58:32 -04:00
Scott Main
86c25decc0
add search tag for swipe view lesson
...
Change-Id: I4e880dbe6d77c89eff7e9b56c4ec98d8b7df906d
2013-05-20 20:54:31 -07:00
Jeff Brown
e9b2f9a069
am 04be10a5: am 36b3b1dd: Merge "Support double-tap home to go to recents." into jb-mr2-dev
...
* commit '04be10a5b1053d3d263a5522239f5ff6faf283e4':
Support double-tap home to go to recents.
2013-05-20 19:22:56 -07:00
Jeff Brown
915618c444
Update media route picker button assets.
...
Bug: 8175766
Change-Id: I96a12f17b6db31723dff18b0d189b5a83d39a72f
2013-05-20 19:10:28 -07:00
Scott Main
e205386e1e
am 66e965dd: am 2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev
...
* commit '66e965dd0fec17a87781821f7a360964a075f18f':
delete orphaned and obsolete files
2013-05-20 18:53:18 -07:00
Jeff Brown
04be10a5b1
am 36b3b1dd: Merge "Support double-tap home to go to recents." into jb-mr2-dev
...
* commit '36b3b1dd0b963e6d0a3d8f7d16e3bdfe5efcbe4d':
Support double-tap home to go to recents.
2013-05-20 18:52:28 -07:00
Jeff Brown
36b3b1dd0b
Merge "Support double-tap home to go to recents." into jb-mr2-dev
2013-05-21 01:50:13 +00:00
Scott Main
66e965dd0f
am 2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev
...
* commit '2377da025abafe367359d8b2d9d1fecb615f7733':
delete orphaned and obsolete files
2013-05-20 18:48:02 -07:00
Scott Main
2377da025a
Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev
2013-05-21 01:46:18 +00:00
Dirk Dougherty
807582cbb9
am 45e87f4e: am 0775c1ba: am b3d79b44: am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs
...
* commit '45e87f4ebe9ddde27dd5e0e28267c433c30b476b':
Doc change: fix tiny url.
2013-05-20 18:15:43 -07:00
Scott Main
7bfd39a47d
delete orphaned and obsolete files
...
Change-Id: I2e199ce5ff5c4e4c9622897eed0072c3aba02bc4
2013-05-20 18:14:42 -07:00
Dirk Dougherty
45e87f4ebe
am 0775c1ba: am b3d79b44: am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs
...
* commit '0775c1ba90633c9d00116299a57ecd84142e67c8':
Doc change: fix tiny url.
2013-05-20 18:12:29 -07:00
Dirk Dougherty
0775c1ba90
am b3d79b44: am 4a3c5584: Merge "Doc change: fix tiny url." into jb-mr1.1-docs
...
* commit 'b3d79b44ebb32bc3f9505a895728ad0a8a16ed2f':
Doc change: fix tiny url.
2013-05-20 18:11:22 -07:00
