OSDN Git Service
The Android Open Source Project [Tue, 7 Feb 2012 18:21:22 +0000 (10:21 -0800)]
The Android Open Source Project [Tue, 7 Feb 2012 18:19:45 +0000 (10:19 -0800)]
am
c9024703: Reconcile with ics-mr1-release
* commit '
c902470310404e42aeb93fca38694b374371e0de':
The Android Open Source Project [Tue, 7 Feb 2012 18:18:29 +0000 (10:18 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib912870641c7efedd4c01066f0e86dd3f85aaa2d
The Android Open Source Project [Tue, 7 Feb 2012 18:12:57 +0000 (10:12 -0800)]
am
97e43949: am
62a16e23: Reconcile with ics-mr1-release
* commit '
97e4394902cd19219dfef7b5e20d7570b1f6ebd8':
IMM30D
IMM30C
IMM3C
The Android Open Source Project [Tue, 7 Feb 2012 18:11:09 +0000 (10:11 -0800)]
am
62a16e23: Reconcile with ics-mr1-release
* commit '
62a16e230529ec015518a3abac872ab008892e2d':
IMM30D
IMM30C
IMM3C
The Android Open Source Project [Tue, 7 Feb 2012 18:09:02 +0000 (10:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8399f0a69c4192e7ef65e3097e7a6820e400e436
The Android Automerger [Tue, 7 Feb 2012 04:29:06 +0000 (20:29 -0800)]
IMM30D
Ed Heyl [Mon, 6 Feb 2012 21:14:03 +0000 (13:14 -0800)]
am
5d2fadb1: (-s ours) am
529a793c: am
daeb1d90: am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
5d2fadb1492c1a2dd5437fcfb4afde2b2c3df4bd':
Ed Heyl [Mon, 6 Feb 2012 21:12:19 +0000 (13:12 -0800)]
am
85c866a1: (-s ours) am
ca2cd25b: (-s ours) am
daeb1d90: am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
85c866a141c5f4fd69972aa7158e22e49944254e':
Please do not merge (already submitted downstream); check entire recovery partition on startup
Ed Heyl [Mon, 6 Feb 2012 21:11:16 +0000 (13:11 -0800)]
am
529a793c: am
daeb1d90: am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
529a793c69f7ab133a29da8e50e67e8e47f2175f':
Ed Heyl [Mon, 6 Feb 2012 21:10:25 +0000 (13:10 -0800)]
am
ca2cd25b: (-s ours) am
daeb1d90: am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
ca2cd25b3542749e491b1c00aeca5d3f59c99ad9':
Please do not merge (already submitted downstream); check entire recovery partition on startup
Ed Heyl [Mon, 6 Feb 2012 21:09:28 +0000 (13:09 -0800)]
am
daeb1d90: am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
daeb1d90415f645269d10d7d61c17c59a5cad61f':
Please do not merge (already submitted downstream); check entire recovery partition on startup
Ed Heyl [Mon, 6 Feb 2012 21:09:03 +0000 (13:09 -0800)]
am
daeb1d90: am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
daeb1d90415f645269d10d7d61c17c59a5cad61f':
Please do not merge (already submitted downstream); check entire recovery partition on startup
Ed Heyl [Mon, 6 Feb 2012 21:07:38 +0000 (13:07 -0800)]
am
c547a4d5: Please do not merge (already submitted downstream); check entire recovery partition on startup
* commit '
c547a4d50b92c8f8173bf4222169f87200a76dba':
Please do not merge (already submitted downstream); check entire recovery partition on startup
Ed Heyl [Mon, 6 Feb 2012 21:03:43 +0000 (13:03 -0800)]
Please do not merge (already submitted downstream); check entire recovery partition on startup
Checksum the entire recovery partition at boot time to see if we need
to rewrite it, rather than just the first 2kb.
Bug:
5668350
Change-Id: I777754f92e8da630ae3c09bb0d4c41884ff62f39
The Android Automerger [Mon, 6 Feb 2012 16:44:05 +0000 (08:44 -0800)]
IMM30C
The Android Automerger [Mon, 6 Feb 2012 16:42:38 +0000 (08:42 -0800)]
IMM3C
Xavier Ducrohet [Fri, 3 Feb 2012 19:13:41 +0000 (11:13 -0800)]
Merge "Add lint to all builds."
Xavier Ducrohet [Fri, 3 Feb 2012 03:16:51 +0000 (19:16 -0800)]
Add lint to all builds.
Change-Id: I30a366b0b313c8e418de38f0790b087f287f3bdf
Jean-Baptiste Queru [Fri, 3 Feb 2012 06:39:30 +0000 (22:39 -0800)]
am
6c6a7012: am
5aec09b5: am
9a741915: Merge "Add annotations to the sdk build."
* commit '
6c6a7012ad0e77518f8aea9e2a70c830c67e99dc':
Add annotations to the sdk build.
Jean-Baptiste Queru [Fri, 3 Feb 2012 06:37:26 +0000 (22:37 -0800)]
am
5aec09b5: am
9a741915: Merge "Add annotations to the sdk build."
* commit '
5aec09b5f3537d0c700b93ede1718a97dbec0050':
Add annotations to the sdk build.
Jean-Baptiste Queru [Fri, 3 Feb 2012 06:34:18 +0000 (22:34 -0800)]
am
9a741915: Merge "Add annotations to the sdk build."
* commit '
9a7419153e7fffa6056a24b567ff3f45111aa0c0':
Add annotations to the sdk build.
Jean-Baptiste Queru [Thu, 2 Feb 2012 21:43:06 +0000 (13:43 -0800)]
Merge "Add annotations to the sdk build."
Xavier Ducrohet [Fri, 27 Jan 2012 23:45:35 +0000 (15:45 -0800)]
Add annotations to the sdk build.
Change-Id: I22ab1e737f05f6134ec9701c8ed69642a3708fbf
Alon Albert [Thu, 2 Feb 2012 01:48:12 +0000 (17:48 -0800)]
Merge "Add requestsync package"
Ying Wang [Thu, 2 Feb 2012 01:38:37 +0000 (17:38 -0800)]
Merge "Use @rpath and @loader_path to avoid absolute path"
Alon Albert [Wed, 1 Feb 2012 23:33:12 +0000 (15:33 -0800)]
Add requestsync package
Change-Id: I0429a7cb238b124d3e42927b9dc806bbd5af0622
Ying Wang [Wed, 1 Feb 2012 21:18:20 +0000 (13:18 -0800)]
Use @rpath and @loader_path to avoid absolute path
With "-Wl,-rpath,@loader_path/../lib" the linker embeds
@loader_path/../lib as the target binary's rpath.
Here @loader_path means the path of the binary that initiates the
loading.
With "-install_name @rpath/libfoo.dylib " the linker runtime searches
libfoo.dylib in the binary's embeded rpath.
With this change you can call dlopen() without specifying the full path
of the shared library.
Change-Id: If9beb3f6f4642a377bff603bab5ba3fdb96211bf
Andreas Huber [Wed, 1 Feb 2012 19:48:30 +0000 (11:48 -0800)]
Include the amr wb encoder shared library in all builds.
Change-Id: I5f61c696336cf77d49d08b6f99d60046774e91f2
Andreas Huber [Wed, 1 Feb 2012 19:31:19 +0000 (11:31 -0800)]
Merge "Include the amr encoder shared library in all builds."
Ying Wang [Wed, 1 Feb 2012 19:28:00 +0000 (11:28 -0800)]
Delete unused var.
Change-Id: Ib6c295287f064529a8b4d8ada15a9fbb73064f1e
Ying Wang [Wed, 1 Feb 2012 19:25:26 +0000 (11:25 -0800)]
Merge "Set install name with absolute path for Mac host shared libraries."
Andreas Huber [Wed, 1 Feb 2012 18:42:44 +0000 (10:42 -0800)]
Include the amr encoder shared library in all builds.
Change-Id: Ib2c4b8ee73d0615e712c672b9badd156906811e6
The Android Open Source Project [Wed, 1 Feb 2012 18:01:20 +0000 (10:01 -0800)]
The Android Open Source Project [Wed, 1 Feb 2012 17:57:50 +0000 (09:57 -0800)]
Ignore
75c781c9
Change-Id: Id97047a665c03bcf35785fba3785cf5575f3341b
The Android Open Source Project [Wed, 1 Feb 2012 17:09:11 +0000 (09:09 -0800)]
am
402e36f1: Reconcile with ics-mr1-release
* commit '
402e36f189cfa1de55deb575da2c34d97fe95389':
IMM30B
IMM29
IMM26B
IMM26
IMM26B
The Android Open Source Project [Wed, 1 Feb 2012 16:49:25 +0000 (08:49 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1d101ce7d4690a74f494cdc605e797130946210c
The Android Open Source Project [Wed, 1 Feb 2012 16:42:31 +0000 (08:42 -0800)]
Reconcile with ics-mr1-release
Change-Id: Icc486a00d6c067c87364023fcf7226686dc0642a
Scott Main [Wed, 1 Feb 2012 08:18:03 +0000 (00:18 -0800)]
am
a57f538a: am
7f24ddbc: Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs" into ics-mr1
* commit '
a57f538a22b99ae0e72e18e95d19635d2e6e0762':
docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs
Scott Main [Wed, 1 Feb 2012 08:15:54 +0000 (00:15 -0800)]
am
769a02fd: am
5be15a0f: Merge "docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue:
5931704" into ics-mr1
* commit '
769a02fd81fdf7e2a92c8282fa5eee05a4273b63':
docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue:
5931704
Ying Wang [Wed, 1 Feb 2012 05:04:25 +0000 (21:04 -0800)]
Set install name with absolute path for Mac host shared libraries.
Before this change, path of the install name is relative to the top dir.
That means you can execute dynamically-linked binaries only in the top dir.
With this change, you can execute dynamically-linked binaries anywhere.
Change-Id: I1c6441579ffb68505ea678296aceb2e66a6df1be
The Android Automerger [Wed, 1 Feb 2012 00:24:20 +0000 (16:24 -0800)]
IMM30B
The Android Automerger [Tue, 31 Jan 2012 23:43:31 +0000 (15:43 -0800)]
IMM29
The Android Automerger [Tue, 31 Jan 2012 23:40:59 +0000 (15:40 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Tue, 31 Jan 2012 23:21:32 +0000 (15:21 -0800)]
am
7f24ddbc: Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs" into ics-mr1
* commit '
7f24ddbc75b301cd3520e8fefaeb2e94a6dcc80b':
docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs
Scott Main [Tue, 31 Jan 2012 23:19:44 +0000 (15:19 -0800)]
Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs" into ics-mr1
Scott Main [Tue, 31 Jan 2012 23:18:47 +0000 (15:18 -0800)]
docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs
Change-Id: I37551efd09bea528200a93a8d3602ea11e63f140
Scott Main [Tue, 31 Jan 2012 22:26:19 +0000 (14:26 -0800)]
am
5be15a0f: Merge "docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue:
5931704" into ics-mr1
* commit '
5be15a0f13ce559ca6339f0d2cf3dca9f3001dc1':
docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue:
5931704
Scott Main [Tue, 31 Jan 2012 22:24:54 +0000 (14:24 -0800)]
Merge "docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue:
5931704" into ics-mr1
Scott Main [Tue, 31 Jan 2012 18:09:34 +0000 (10:09 -0800)]
docs: update TOS and PP links to point to unified policy/tems
also add a link to the b.android.com issue for reporting doc issues
and open footer links in a new window
issue:
5931704
Change-Id: Icd6e9b7fb742b05a3c2064b6f2f7767b5b7ed1d8
The Android Automerger [Tue, 31 Jan 2012 07:40:32 +0000 (23:40 -0800)]
IMM26B
The Android Automerger [Tue, 31 Jan 2012 07:38:52 +0000 (23:38 -0800)]
IMM26
The Android Automerger [Tue, 31 Jan 2012 07:33:57 +0000 (23:33 -0800)]
IMM26B
The Android Automerger [Tue, 31 Jan 2012 07:33:21 +0000 (23:33 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Tue, 31 Jan 2012 01:24:54 +0000 (17:24 -0800)]
am
a20557fb: am
2032e319: docs: add schema.org sitenavigation scope for sid-navs
* commit '
a20557fb4ddb3f008caf7bdb920c9ab90945ef7f':
docs: add schema.org sitenavigation scope for sid-navs
Scott Main [Tue, 31 Jan 2012 01:23:02 +0000 (17:23 -0800)]
am
2032e319: docs: add schema.org sitenavigation scope for sid-navs
* commit '
2032e31979d0708120b4785bad6ee19ee1c4dc0c':
docs: add schema.org sitenavigation scope for sid-navs
Scott Main [Tue, 31 Jan 2012 00:26:41 +0000 (16:26 -0800)]
docs: add schema.org sitenavigation scope for sid-navs
Change-Id: I0952195223f93bda67af0b951c3a061fe92948ce
Scott Main [Tue, 31 Jan 2012 00:17:13 +0000 (16:17 -0800)]
am
3728f56b: am
939c3f72: docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
* commit '
3728f56bc62f35d576b12180f5bbf33d0c83f00d':
docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
Scott Main [Tue, 31 Jan 2012 00:15:28 +0000 (16:15 -0800)]
am
939c3f72: docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
* commit '
939c3f72280fadbdc192b6bedd97555c2fcd4ef3':
docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
Wink Saville [Mon, 30 Jan 2012 23:42:28 +0000 (15:42 -0800)]
Merge "Increase java heap size."
Wink Saville [Mon, 30 Jan 2012 23:30:10 +0000 (15:30 -0800)]
Increase java heap size.
I got an Out of memory while compiling, Andreas Huber suggested that
increasing the heap size, which worked.
Change-Id: Id8293ef100ef814b0fe13aa6e1b891a36a2ee853
Scott Main [Mon, 30 Jan 2012 23:28:24 +0000 (15:28 -0800)]
am
1d5b7c54: am
3652a113: docs: add support for meta descriptions in the <head>
* commit '
1d5b7c5490d256bdaa516db4aaed584e9f0d1469':
docs: add support for meta descriptions in the <head>
Scott Main [Mon, 30 Jan 2012 23:14:07 +0000 (15:14 -0800)]
docs: modify css to support sidenav headings with span, instead of h2
because I suspect the h2 is sending mixed signals to search engines for result snippets
Change-Id: I80f13774f25439efebcade1b9db41c005018d2aa
Scott Main [Mon, 30 Jan 2012 23:14:44 +0000 (15:14 -0800)]
am
3652a113: docs: add support for meta descriptions in the <head>
* commit '
3652a113d1a099ece283e3154188f4a42958c298':
docs: add support for meta descriptions in the <head>
James Dong [Mon, 30 Jan 2012 22:42:27 +0000 (14:42 -0800)]
Merge "Added libstagefright_soft_aacenc to all builds of all products"
The Android Open Source Project [Mon, 30 Jan 2012 21:38:36 +0000 (13:38 -0800)]
am
4e29e398: Reconcile with ics-mr1-release
* commit '
4e29e3986710c4078faaac9ae662d8f79d74d51f':
IMM30
IMM26
IMM25
IMM24
IMM20C
The Android Open Source Project [Mon, 30 Jan 2012 21:36:23 +0000 (13:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iae7c919c7e0b4dcbf024514431421cdfd225a507
The Android Automerger [Mon, 30 Jan 2012 21:26:51 +0000 (13:26 -0800)]
IMM30
The Android Automerger [Mon, 30 Jan 2012 21:21:49 +0000 (13:21 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Mon, 30 Jan 2012 21:03:08 +0000 (13:03 -0800)]
docs: add support for meta descriptions in the <head>
Change-Id: I7ff7a5083a75dde718b4701623e029c225289617
Ying Wang [Mon, 30 Jan 2012 21:00:49 +0000 (13:00 -0800)]
Merge "Build should fail if any proto file fails compiling"
James Dong [Mon, 30 Jan 2012 20:28:19 +0000 (12:28 -0800)]
Added libstagefright_soft_aacenc to all builds of all products
o related-to-bug:
5939000
Change-Id: I938890486ba560d598888a3dd73c8b16d3d82aa0
Ying Wang [Mon, 30 Jan 2012 19:56:07 +0000 (11:56 -0800)]
Build should fail if any proto file fails compiling
When compile multipling proto files to Java in a for loop.
Change-Id: Ie6a9d3972401b0ad6406bf911db916fcbf88037b
Scott Main [Mon, 30 Jan 2012 18:06:28 +0000 (10:06 -0800)]
am
c73e26f3: am
dc7418b2: docs: add images for g+ homepage announcement
* commit '
c73e26f3bd038b17e60e24d0ed4d6e125bc2ef00':
docs: add images for g+ homepage announcement
Scott Main [Mon, 30 Jan 2012 18:04:17 +0000 (10:04 -0800)]
am
dc7418b2: docs: add images for g+ homepage announcement
* commit '
dc7418b282faf264c495e82a5bc3366e8348676c':
docs: add images for g+ homepage announcement
Scott Main [Mon, 30 Jan 2012 17:53:13 +0000 (09:53 -0800)]
docs: add images for g+ homepage announcement
Change-Id: I36430a1885be368218e1c896d6fc008355096a06
Xavier Ducrohet [Sat, 28 Jan 2012 00:45:09 +0000 (16:45 -0800)]
Add missing tools jar to the sdk product modules.
Change-Id: Ifb44f38bd3d5d710fce1b6da11b40a524c3d09d8
Xavier Ducrohet [Fri, 27 Jan 2012 23:45:35 +0000 (15:45 -0800)]
Add annotations to the sdk build.
Change-Id: I4f13648f74c80f7ec13545066cdebd67e805d82e
The Android Automerger [Fri, 27 Jan 2012 02:32:53 +0000 (18:32 -0800)]
IMM26
The Android Automerger [Fri, 27 Jan 2012 02:31:51 +0000 (18:31 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Raphael Moll [Thu, 26 Jan 2012 23:11:46 +0000 (15:11 -0800)]
Move Windows SDK whitelist out of main.mk
This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.
Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git
Change-Id: Id6178b000c464c989da2c7f22977986a60de1f44
The Android Automerger [Wed, 25 Jan 2012 20:11:56 +0000 (12:11 -0800)]
IMM25
The Android Automerger [Wed, 25 Jan 2012 20:07:31 +0000 (12:07 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Wed, 25 Jan 2012 19:21:37 +0000 (11:21 -0800)]
You know back when I said this thing about Ice Cream Sandwich MR2?
What was I thinking?
That would be *ridiculous*.
What sane person would come up with a release like that?!?
I mean... four words! Six if you try to say it! Insane!!
Instead, we shall call you:
Jelly Bean.
Yum.
Change-Id: Ice28fc17b7eb77cf6b708958161339890234d1d8
The Android Automerger [Tue, 24 Jan 2012 21:35:44 +0000 (13:35 -0800)]
IMM24
The Android Automerger [Tue, 24 Jan 2012 21:31:44 +0000 (13:31 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:44:22 +0000 (08:44 -0800)]
am
40101047: am
7a8efe57: Merge "Remove non-existent AlarmProvider to fix SDK build."
* commit '
4010104732bdae0de5027c4241db5d3cb6230252':
Remove non-existent AlarmProvider to fix SDK build.
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:38:57 +0000 (08:38 -0800)]
am
7a8efe57: Merge "Remove non-existent AlarmProvider to fix SDK build."
* commit '
7a8efe57a9505940cd51c7664e8643ec9da9d24d':
Remove non-existent AlarmProvider to fix SDK build.
Jean-Baptiste Queru [Tue, 24 Jan 2012 15:50:01 +0000 (07:50 -0800)]
Merge "Remove non-existent AlarmProvider to fix SDK build."
The Android Automerger [Tue, 24 Jan 2012 00:55:54 +0000 (16:55 -0800)]
IMM20C
Ying Wang [Mon, 23 Jan 2012 18:53:23 +0000 (10:53 -0800)]
Remove non-existent AlarmProvider to fix SDK build.
Change-Id: Ifcd087b9022f29b4b7065a72cafbbc6b3704860b
The Android Open Source Project [Mon, 23 Jan 2012 18:41:27 +0000 (10:41 -0800)]
am
51475183: Reconcile with ics-mr1-release
* commit '
514751834753b30d37eae591ccce2e69e3468602':
IMM20B
IMM20
The Android Open Source Project [Mon, 23 Jan 2012 18:15:33 +0000 (10:15 -0800)]
Reconcile with ics-mr1-release
Change-Id: I6e64890cacfdb167f2f0c7a5e3917284e391ce11
The Android Open Source Project [Sat, 21 Jan 2012 00:37:56 +0000 (16:37 -0800)]
am
c541cd6e: Reconcile with ics-mr1-release
* commit '
c541cd6ecb59fdaa339585c48395d06ccd03867e':
IMM19
The Android Automerger [Sat, 21 Jan 2012 00:31:06 +0000 (16:31 -0800)]
IMM20B
The Android Automerger [Sat, 21 Jan 2012 00:15:22 +0000 (16:15 -0800)]
IMM20
The Android Automerger [Sat, 21 Jan 2012 00:11:14 +0000 (16:11 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Fri, 20 Jan 2012 23:52:13 +0000 (15:52 -0800)]
am
c9054b11: Reconcile with ics-mr1-release
* commit '
c9054b11fa3895fe70b2eaba849c6388df449c1e':
IMM18
IMM13
IMM12
Ying Wang [Fri, 20 Jan 2012 20:22:49 +0000 (12:22 -0800)]
Workaround for lack of "-Wl,--whole-archive" in MacOS's linker.
Change-Id: I2b1de0a253d341bcb7ee05fdc96bdc0d0967985e
The Android Open Source Project [Fri, 20 Jan 2012 18:25:20 +0000 (10:25 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3bdc5d19073e63e031b684bede64b1f5ebdf13e7