OSDN Git Service
Robert Greenwalt [Fri, 24 May 2013 16:24:32 +0000 (09:24 -0700)]
am
36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev
* commit '
36a151abcd794524358a74599a1f4ab130ca7b55':
Use the old interface when resetting connections
Robert Greenwalt [Fri, 24 May 2013 16:21:34 +0000 (16:21 +0000)]
Merge "Use the old interface when resetting connections" into jb-mr2-dev
Robert Greenwalt [Fri, 24 May 2013 01:33:06 +0000 (18:33 -0700)]
Use the old interface when resetting connections
The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).
bug:
9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9
Joe Fernandez [Thu, 23 May 2013 21:08:51 +0000 (14:08 -0700)]
am
62f47bc2: am
22689bc5: am
a8b2186b: am
a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
* commit '
62f47bc29588e495a6f8efd082b34a92f8ec2098':
docs: Add FileProvider to Support Library r13 Release Notes
Joe Fernandez [Thu, 23 May 2013 21:06:41 +0000 (14:06 -0700)]
am
22689bc5: am
a8b2186b: am
a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
* commit '
22689bc5e52a1c2f2d748440c0eeeebec17637c2':
docs: Add FileProvider to Support Library r13 Release Notes
Jim Miller [Thu, 23 May 2013 21:05:21 +0000 (14:05 -0700)]
am
2f48c4a7: Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev
* commit '
2f48c4a754ce40a0854791c1f4ddf61458fffafc':
Check for invalid pointer index in PagedView
Joe Fernandez [Thu, 23 May 2013 21:04:41 +0000 (14:04 -0700)]
am
a8b2186b: am
a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
* commit '
a8b2186b09a0f79b746d0fbab3611d95877af5fe':
docs: Add FileProvider to Support Library r13 Release Notes
Jim Miller [Thu, 23 May 2013 20:38:02 +0000 (20:38 +0000)]
Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev
Joe Fernandez [Thu, 23 May 2013 21:01:23 +0000 (14:01 -0700)]
am
a502c59e: docs: Add FileProvider to Support Library r13 Release Notes
* commit '
a502c59e679c1b355d6ad3387449d82c590d84cf':
docs: Add FileProvider to Support Library r13 Release Notes
Andrew Wilson [Thu, 23 May 2013 20:08:04 +0000 (13:08 -0700)]
am
55bf965e: Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev
* commit '
55bf965e89df5986a7a988c2b1ec2cd9f01edb56':
Compare binder instances when checking if listeners match.
Andrew Wilson [Thu, 23 May 2013 18:47:48 +0000 (18:47 +0000)]
Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev
Chet Haase [Thu, 23 May 2013 18:25:34 +0000 (11:25 -0700)]
am
cfbbc864: Merge "Restore previous alpha value on noop\'d DisplayList operations" into jb-mr2-dev
* commit '
cfbbc864da1b7a9ed64807f9072c5730c421b4ef':
Restore previous alpha value on noop'd DisplayList operations
Chet Haase [Thu, 23 May 2013 18:23:34 +0000 (18:23 +0000)]
Merge "Restore previous alpha value on noop'd DisplayList operations" into jb-mr2-dev
Joe Fernandez [Thu, 23 May 2013 18:16:09 +0000 (11:16 -0700)]
docs: Add FileProvider to Support Library r13 Release Notes
Change-Id: I9a87312f1bb5d4a18c720a9c3d3a558240450f6d
kmccormick [Thu, 23 May 2013 18:01:50 +0000 (11:01 -0700)]
am
5482b65a: am
88f24e6f: am
84fb096e: am
e56e2483: am
7b1adeb8: am
c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
* commit '
5482b65ae8d3d02fa4b07a2221b3f00079c9aa80':
Doc update: fix GCM TOC
kmccormick [Thu, 23 May 2013 17:56:56 +0000 (10:56 -0700)]
am
88f24e6f: am
84fb096e: am
e56e2483: am
7b1adeb8: am
c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
* commit '
88f24e6fe8b854f43bebc77c891228a28a503cd9':
Doc update: fix GCM TOC
kmccormick [Thu, 23 May 2013 17:54:10 +0000 (10:54 -0700)]
am
84fb096e: am
e56e2483: am
7b1adeb8: am
c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
* commit '
84fb096ee7a4f6d2af7dab6e18063ed029e0ff94':
Doc update: fix GCM TOC
kmccormick [Thu, 23 May 2013 17:51:49 +0000 (10:51 -0700)]
am
e56e2483: am
7b1adeb8: am
c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
* commit '
e56e2483c57f9d6a12421ca7e124e7ec0e61f0ab':
Doc update: fix GCM TOC
kmccormick [Thu, 23 May 2013 17:49:58 +0000 (10:49 -0700)]
am
7b1adeb8: am
c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
* commit '
7b1adeb80ae87e9eff90aa01bae35053fc74c66f':
Doc update: fix GCM TOC
kmccormick [Thu, 23 May 2013 17:47:13 +0000 (10:47 -0700)]
am
c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
* commit '
c6c149aa14610925158ef1ba6320c9356e45e631':
Doc update: fix GCM TOC
kmccormick [Thu, 23 May 2013 17:45:26 +0000 (17:45 +0000)]
Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs
Baligh Uddin [Thu, 23 May 2013 16:15:51 +0000 (09:15 -0700)]
am
a9a0409d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
a9a0409d626bc63c6cbd4b734ce8609559bb9540':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 23 May 2013 16:14:16 +0000 (16:14 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
The Android Open Source Project [Thu, 23 May 2013 15:05:15 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I339cc5b68bd236440c5d2ccbbc800ffcd3a0e7c6
Chet Haase [Thu, 23 May 2013 14:57:17 +0000 (07:57 -0700)]
Restore previous alpha value on noop'd DisplayList operations
Previously, when a DisplayList operation was rejected because it was not
in the clip bounds, the code would not properly restore the previous
state, leading to errors in alpha values of the noop'd op being applied
to unrelated operations later in the DisplayList.
Issue #
9051935 Flash of grey background when transitioning to conversation view
Change-Id: I56645cc9ebf2e07be0228ca5e249213dbeb10d7d
Amith Yamasani [Thu, 23 May 2013 14:41:09 +0000 (07:41 -0700)]
am
60b4afed: Merge "Fix account filtering for specific package name" into jb-mr2-dev
* commit '
60b4afedbeea11983b748d0d8ea9032d177dd6e7':
Fix account filtering for specific package name
Amith Yamasani [Thu, 23 May 2013 14:39:07 +0000 (14:39 +0000)]
Merge "Fix account filtering for specific package name" into jb-mr2-dev
The Android Automerger [Thu, 23 May 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Baligh Uddin [Thu, 23 May 2013 05:14:01 +0000 (22:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8af9de6adcf346f5d2b9241eceefdc42a4c42026
Auto-generated-cl: translation import
Amith Yamasani [Thu, 23 May 2013 02:41:45 +0000 (19:41 -0700)]
Fix account filtering for specific package name
Hacks to enable gms to see accounts were interfering with checking for
explicit package name.
Bug:
9095427
Change-Id: Iae65ea2a678d7403d023fa1a61c01347b77c3b5a
Jeff Brown [Wed, 22 May 2013 03:37:51 +0000 (20:37 -0700)]
Add a queue of pending finished input events.
Although in practice an application or IME is unlikely to fill up
the input channel with finish events, it can happen when events are
being delivered very rapidly. Handle this situation by queuing
up the pending finish events until the socket becomes writable again.
Bug:
9034301
Change-Id: I938a62a75d12106a19cff2d016ba7af0db877ecf
kmccormick [Thu, 23 May 2013 01:25:21 +0000 (18:25 -0700)]
Doc update: fix GCM TOC
Change-Id: I38753475fdf6c33d80e0e099cb6c5dcf2f05de0b
Ying Wang [Thu, 23 May 2013 01:00:28 +0000 (18:00 -0700)]
am
1fa3cdf0: Merge "Move offline-pdk to where the source is." into jb-mr2-dev
* commit '
1fa3cdf0cbc9bc788a313eda5d3ca3e2ad77fcc4':
Move offline-pdk to where the source is.
Ying Wang [Thu, 23 May 2013 00:56:20 +0000 (00:56 +0000)]
Merge "Move offline-pdk to where the source is." into jb-mr2-dev
Scott Main [Thu, 23 May 2013 00:14:28 +0000 (17:14 -0700)]
am
9d38ba20: am
cfc593d5: am
38b9aaa0: am
2cc84c63: add VID for Haier to docs
* commit '
9d38ba200eba5973256bf0c15cb394efc9211561':
add VID for Haier to docs
Scott Main [Thu, 23 May 2013 00:10:28 +0000 (17:10 -0700)]
am
cfc593d5: am
38b9aaa0: am
2cc84c63: add VID for Haier to docs
* commit '
cfc593d5736b627e0fffe92e511ee326b9f6d326':
add VID for Haier to docs
Scott Main [Thu, 23 May 2013 00:08:20 +0000 (17:08 -0700)]
am
38b9aaa0: am
2cc84c63: add VID for Haier to docs
* commit '
38b9aaa0fc1b49fa4e734bb0eba28711b6b0d165':
add VID for Haier to docs
Scott Main [Thu, 23 May 2013 00:06:45 +0000 (17:06 -0700)]
am
2cc84c63: add VID for Haier to docs
* commit '
2cc84c638a3a1048d9704a8c987d1436dd27fcd6':
add VID for Haier to docs
Jim Miller [Wed, 22 May 2013 22:53:24 +0000 (15:53 -0700)]
Check for invalid pointer index in PagedView
Fixes bug
9088039
Change-Id: I54897df39adbf224ef3dd3de4ce7254fb70b587c
Jeff Brown [Wed, 22 May 2013 22:46:57 +0000 (15:46 -0700)]
am
d6619ed8: Merge "Add a queue of pending finished input events." into jb-mr2-dev
* commit '
d6619ed89ff7e10b0b66aadc353cfea171929344':
Add a queue of pending finished input events.
Jeff Brown [Wed, 22 May 2013 22:44:17 +0000 (22:44 +0000)]
Merge "Add a queue of pending finished input events." into jb-mr2-dev
Geremy Condra [Wed, 22 May 2013 20:05:14 +0000 (13:05 -0700)]
am
1b12ab00: am
9c759e39: Merge "Fix SELinux get.. methods aborting on invalid address"
* commit '
1b12ab00998b96046ef617a8d109fadcf29a1b39':
Fix SELinux get.. methods aborting on invalid address
Geremy Condra [Wed, 22 May 2013 20:03:21 +0000 (13:03 -0700)]
am
9c759e39: Merge "Fix SELinux get.. methods aborting on invalid address"
* commit '
9c759e3968015c0d30a1a049754e4514adfdb565':
Fix SELinux get.. methods aborting on invalid address
Geremy Condra [Wed, 22 May 2013 19:25:37 +0000 (19:25 +0000)]
Merge "Fix SELinux get.. methods aborting on invalid address"
Jeff Tinker [Wed, 22 May 2013 19:14:15 +0000 (12:14 -0700)]
am
606ab470: Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev
* commit '
606ab4706df372974cc86eb1bb1c50d79422d7cc':
Improve exception error messages to help diagnose app errors
Jeff Tinker [Wed, 22 May 2013 19:14:13 +0000 (12:14 -0700)]
am
2161b7cb: Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into jb-mr2-dev
* commit '
2161b7cb79576b82a8f3bb964e25739e488d4c29':
Fix invalid keyType translation in MediaDrm.getKeyRequest
Jeff Tinker [Wed, 22 May 2013 19:12:38 +0000 (19:12 +0000)]
Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev
Jeff Tinker [Wed, 22 May 2013 19:12:00 +0000 (19:12 +0000)]
Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into jb-mr2-dev
Jeff Brown [Wed, 22 May 2013 03:37:51 +0000 (20:37 -0700)]
Add a queue of pending finished input events.
Although in practice an application or IME is unlikely to fill up
the input channel with finish events, it can happen when events are
being delivered very rapidly. Handle this situation by queuing
up the pending finish events until the socket becomes writable again.
Bug:
9034301
Change-Id: I938a62a75d12106a19cff2d016ba7af0db877ecf
Andrew Wilson [Wed, 22 May 2013 16:35:35 +0000 (09:35 -0700)]
Compare binder instances when checking if listeners match.
Bug:
9069919
Change-Id: I06130105cb703de35de76ab2fceba3855fa5407a
Scott Main [Wed, 22 May 2013 15:34:49 +0000 (08:34 -0700)]
add VID for Haier to docs
Change-Id: I3999d2b9d712ac3f5d2ce6325a30d07a743dbc15
The Android Open Source Project [Wed, 22 May 2013 14:22:55 +0000 (07:22 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I6b893f5e3dfaf567b0e2c5d7eef423556603d1a9
Richard Haines [Wed, 22 May 2013 14:12:16 +0000 (15:12 +0100)]
Fix SELinux get.. methods aborting on invalid address
SELinux get.. JNI need the 'security_context_t tmp' entries set
to NULL, otherwise on error freecon() tries to release uninitialised
memory causing apps to abort with invalid address.
Also fixed getPeerCon ALOGV call as this caused Zyote to abort when
verbose logging set.
Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
Adam Koch [Wed, 22 May 2013 13:53:34 +0000 (06:53 -0700)]
am
d51fc576: am
3e4ea33f: am
4f6d0cbd: am
7258e6bc: am
1fc7e59b: am
14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
* commit '
d51fc5763d3ce7895e168ace65da4c253b16d57e':
Doc change: fix minor typo in ContactsContract.RawContacts.
Adam Koch [Wed, 22 May 2013 13:52:00 +0000 (06:52 -0700)]
am
3e4ea33f: am
4f6d0cbd: am
7258e6bc: am
1fc7e59b: am
14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
* commit '
3e4ea33f087926d9039f7b4428dc967a8e760209':
Doc change: fix minor typo in ContactsContract.RawContacts.
Adam Koch [Wed, 22 May 2013 13:49:43 +0000 (06:49 -0700)]
am
4f6d0cbd: am
7258e6bc: am
1fc7e59b: am
14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
* commit '
4f6d0cbdd9372754b1b5b112e2b724b3852ac12b':
Doc change: fix minor typo in ContactsContract.RawContacts.
Adam Koch [Wed, 22 May 2013 13:45:33 +0000 (06:45 -0700)]
am
7258e6bc: am
1fc7e59b: am
14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
* commit '
7258e6bc57fb3cb023a4ca219f1355cf55ea93bf':
Doc change: fix minor typo in ContactsContract.RawContacts.
Adam Koch [Wed, 22 May 2013 13:43:16 +0000 (06:43 -0700)]
am
1fc7e59b: am
14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
* commit '
1fc7e59b3301bb74223393354571ad4e6b7ecfce':
Doc change: fix minor typo in ContactsContract.RawContacts.
Adam Koch [Wed, 22 May 2013 13:41:26 +0000 (06:41 -0700)]
am
14233ee5: Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
* commit '
14233ee5d06c468f953dff2d900a9cf32f9737c0':
Doc change: fix minor typo in ContactsContract.RawContacts.
Adam Koch [Wed, 22 May 2013 13:36:57 +0000 (13:36 +0000)]
Merge "Doc change: fix minor typo in ContactsContract.RawContacts." into jb-mr1.1-docs
The Android Automerger [Wed, 22 May 2013 12:55:23 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Romain Guy [Wed, 22 May 2013 02:11:16 +0000 (19:11 -0700)]
am
2f35d244: Merge "Avoid extraneous EGL surface allocations Bug #
8667873" into jb-mr2-dev
* commit '
2f35d2441e59b996a56653881fdc2f52d4eeb644':
Avoid extraneous EGL surface allocations Bug #
8667873
Romain Guy [Wed, 22 May 2013 02:08:24 +0000 (02:08 +0000)]
Merge "Avoid extraneous EGL surface allocations Bug #
8667873" into jb-mr2-dev
Ying Wang [Wed, 22 May 2013 01:03:29 +0000 (18:03 -0700)]
Move offline-pdk to where the source is.
Change-Id: I10b05c28954a27f11482751e14287ec21422dce2
Jeff Tinker [Tue, 21 May 2013 19:35:06 +0000 (12:35 -0700)]
Fix invalid keyType translation in MediaDrm.getKeyRequest
bug:
9070897
Change-Id: Ib9b4174e08b1c828d0204e0ab65bc3d7c2efcedf
Robert Greenwalt [Tue, 21 May 2013 19:56:04 +0000 (12:56 -0700)]
am
4c32885c: Merge "Don\'t put up wifi-available note when disabled" into jb-mr2-dev
* commit '
4c32885c4249be9b0a9e674b96ebacc78152b47e':
Don't put up wifi-available note when disabled
Jeff Tinker [Tue, 21 May 2013 19:48:14 +0000 (12:48 -0700)]
Improve exception error messages to help diagnose app errors
bug:
9072051
Change-Id: I45057951d1a62b1b4a996e85f01601239e1b7161
Robert Greenwalt [Tue, 21 May 2013 19:54:39 +0000 (19:54 +0000)]
Merge "Don't put up wifi-available note when disabled" into jb-mr2-dev
Romain Guy [Tue, 21 May 2013 19:15:07 +0000 (12:15 -0700)]
Avoid extraneous EGL surface allocations
Bug #
8667873
windowShouldResize means we need to layout the window, it doesn't mean
the dimensions of the surface have changed. We should only check the
width and the height. With this fix we can avoid a surface allocation
every time the window shade is opened or closed.
Change-Id: I8afe97b820a865723f2aab7a5aa4ddc8eaaec6e1
Jeff Brown [Tue, 21 May 2013 18:39:43 +0000 (11:39 -0700)]
am
acad301a: Merge "Update media route picker button assets." into jb-mr2-dev
* commit '
acad301ae7f7d950aa54526c379d0ca605f180ca':
Update media route picker button assets.
Jeff Brown [Tue, 21 May 2013 18:37:06 +0000 (18:37 +0000)]
Merge "Update media route picker button assets." into jb-mr2-dev
Robert Greenwalt [Tue, 21 May 2013 18:17:11 +0000 (11:17 -0700)]
Don't put up wifi-available note when disabled
With the new scan-always mode we will get scan results when disabled.
Don't tell the user about open AP when they've turned off wifi.
bug:
9067982
Change-Id: I7a303c2a6f87a331443eeb54fa8ff5b467c0a1ff
Jay Shrauner [Tue, 21 May 2013 18:02:33 +0000 (11:02 -0700)]
am
34bed420: Merge "Update CALL_PRIVILEGED docs" into jb-mr2-dev
* commit '
34bed4206750eadd69737274dc641b2d1444af3f':
Update CALL_PRIVILEGED docs
Jay Shrauner [Tue, 21 May 2013 17:59:25 +0000 (17:59 +0000)]
Merge "Update CALL_PRIVILEGED docs" into jb-mr2-dev
Daniel Sandler [Tue, 21 May 2013 17:37:27 +0000 (10:37 -0700)]
am
f5ceaf4b: Merge "Archive a copy of each dismissed notification." into jb-mr2-dev
* commit '
f5ceaf4b19362b3cf7882bf8a6d086841f551fed':
Archive a copy of each dismissed notification.
Daniel Sandler [Tue, 21 May 2013 17:35:17 +0000 (17:35 +0000)]
Merge "Archive a copy of each dismissed notification." into jb-mr2-dev
Dirk Dougherty [Tue, 21 May 2013 17:23:23 +0000 (10:23 -0700)]
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.
Dirk Dougherty [Tue, 21 May 2013 17:21:34 +0000 (10:21 -0700)]
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.
Dirk Dougherty [Tue, 21 May 2013 17:19:39 +0000 (10:19 -0700)]
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.
Scott Main [Tue, 21 May 2013 17:17:46 +0000 (10:17 -0700)]
am
dad413d0: am
c7785844: am
e6fbd9ed: am
86c25dec: add search tag for swipe view lesson
* commit '
dad413d01e08bcd5b709b438a4780a1956c7673e':
add search tag for swipe view lesson
Scott Main [Tue, 21 May 2013 17:15:36 +0000 (10:15 -0700)]
am
c7785844: am
e6fbd9ed: am
86c25dec: add search tag for swipe view lesson
* commit '
c778584443cfb3af5a4f449959e16997edede266':
add search tag for swipe view lesson
Dirk Dougherty [Tue, 21 May 2013 17:14:58 +0000 (10:14 -0700)]
am
0269b3dd: am
6a4214f0: am
a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
* commit '
0269b3dde009650192a3a746929e5f4c8b54e0c2':
Doc change: fix doc title.
Scott Main [Tue, 21 May 2013 17:14:03 +0000 (10:14 -0700)]
am
e6fbd9ed: am
86c25dec: add search tag for swipe view lesson
* commit '
e6fbd9ed6f9bda28d1279d4b762d8f0ab885ab47':
add search tag for swipe view lesson
Dirk Dougherty [Tue, 21 May 2013 17:12:55 +0000 (10:12 -0700)]
am
6a4214f0: am
a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
* commit '
6a4214f065d05e9ec0480929c2ed800d0e3a86f8':
Doc change: fix doc title.
Scott Main [Tue, 21 May 2013 17:11:41 +0000 (10:11 -0700)]
am
86c25dec: add search tag for swipe view lesson
* commit '
86c25decc05bcf9f3085ccbcfb18e31d6d010970':
add search tag for swipe view lesson
Dirk Dougherty [Tue, 21 May 2013 17:07:03 +0000 (10:07 -0700)]
am
a963459e: Merge "Doc change: fix doc title." into jb-mr1.1-docs
* commit '
a963459e3f96f2b27d87e3fccdfa8fb98f0f9ab6':
Doc change: fix doc title.
Dirk Dougherty [Tue, 21 May 2013 17:05:08 +0000 (17:05 +0000)]
Merge "Doc change: fix doc title." into jb-mr1.1-docs
Dirk Dougherty [Tue, 21 May 2013 17:03:35 +0000 (10:03 -0700)]
Doc change: fix doc title.
Change-Id: I2303ef05df89780ab3fa396b248097ea1115bb05
The Android Open Source Project [Tue, 21 May 2013 15:59:00 +0000 (08:59 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I78fc7efc6eaaf9cba14f30d83be55ef494804de0
The Android Automerger [Tue, 21 May 2013 14:46:48 +0000 (07:46 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Adam Koch [Tue, 21 May 2013 13:47:55 +0000 (09:47 -0400)]
Doc change: fix minor typo in ContactsContract.RawContacts.
Change-Id: I31dbc85449fa81c9f5ea61fdaa0d4a89cf97cd86
Scott Main [Tue, 21 May 2013 09:33:44 +0000 (02:33 -0700)]
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
Dirk Dougherty [Tue, 21 May 2013 09:33:42 +0000 (02:33 -0700)]
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.
Scott Main [Tue, 21 May 2013 09:31:16 +0000 (02:31 -0700)]
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
Dirk Dougherty [Tue, 21 May 2013 09:31:12 +0000 (02:31 -0700)]
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.
Daniel Sandler [Tue, 21 May 2013 00:56:43 +0000 (20:56 -0400)]
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
Scott Main [Tue, 21 May 2013 03:54:31 +0000 (20:54 -0700)]
add search tag for swipe view lesson
Change-Id: I4e880dbe6d77c89eff7e9b56c4ec98d8b7df906d
Jeff Brown [Tue, 21 May 2013 02:10:28 +0000 (19:10 -0700)]
Update media route picker button assets.
Bug:
8175766
Change-Id: I96a12f17b6db31723dff18b0d189b5a83d39a72f
Scott Main [Tue, 21 May 2013 01:53:18 +0000 (18:53 -0700)]
am
66e965dd: am
2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev
* commit '
66e965dd0fec17a87781821f7a360964a075f18f':
delete orphaned and obsolete files
Jeff Brown [Tue, 21 May 2013 01:52:28 +0000 (18:52 -0700)]
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.
OSDN Git Service
