The Android Automerger
63b89fae0b
"LKY42"
2015-02-11 06:07:54 -08:00
The Android Automerger
addcae28f9
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-02-11 06:05:14 -08:00
smain@google.com
19b8c2f776
am 8cde3e71
: am cf80e847
: am d162be5b
: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit '8cde3e71e77472b70da6e810ec1e12c30243ef61':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 19:19:33 +00:00
smain@google.com
8cde3e71e7
am cf80e847
: am d162be5b
: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit 'cf80e8479bc71538902ac07df91fff8d544a174e':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 19:12:49 +00:00
smain@google.com
cf80e8479b
am d162be5b
: change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
...
* commit 'd162be5b5f65ba0311374242d48303f120398d48':
change video analytics to distinguish between start and resume events. also scrub out any additional parameters from the videoId before passing to analytics
2015-02-10 19:05:42 +00:00
The Android Automerger
22a1064b41
"LKY41"
2015-02-10 06:07:21 -08:00
The Android Automerger
3d20ceae26
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-02-10 06:05:26 -08:00
The Android Automerger
d44fa00ea0
"LKY40"
2015-02-09 06:05:35 -08:00
The Android Automerger
a977996598
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-02-09 06:05:06 -08:00
The Android Automerger
b91d95b928
"LKY38"
2015-02-07 06:06:18 -08:00
The Android Automerger
ee784c55f3
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-02-07 06:05:12 -08:00
Jesse Zhao
c6af9b8f4a
am 28b2b00a
: Merge "Update vendor fingerprint." into lmp-mr1-dev
...
* commit '28b2b00adb7b77a5a6e5654e078c887ed5a425aa':
Update vendor fingerprint.
2015-02-06 22:27:27 +00:00
Jesse Zhao
28b2b00adb
Merge "Update vendor fingerprint." into lmp-mr1-dev
2015-02-06 22:21:06 +00:00
Dan Albert
3907eaf8b7
am cd082d4b
: Allow system images larger than 2GiB.
...
* commit 'cd082d4bfe917b2e6b97436839cbbbc67c733c83':
Allow system images larger than 2GiB.
2015-02-06 21:41:09 +00:00
Dan Albert
cd082d4bfe
Allow system images larger than 2GiB.
...
Python 2.7's zipfile implementation wrongly thinks that zip64 is
required for files larger than 2GiB. We can work around this by
adjusting their limit. Note that `zipfile.writestr()` will not work
for strings larger than 2GiB. The Python interpreter sometimes rejects
strings that large (though it isn't clear to me exactly what
circumstances cause this). `zipfile.write()` must be used directly to
work around this.
This mess can be avoided if we port to python3.
Bug: 18015246
Change-Id: I8a476d99c5efdef6ea408373b706e9fbd3a798be
2015-02-06 13:24:06 -08:00
Jesse Zhao
2625d27151
Update vendor fingerprint.
...
Change-Id: I5d4abdff8b7b13e01271440f4d4f2ffe1b015b71
Bug: 19257598
2015-02-06 09:50:06 -08:00
The Android Automerger
d4f93be6cb
"LKY37"
2015-02-06 06:06:47 -08:00
The Android Automerger
8312d5e809
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-02-06 06:05:09 -08:00
smain@google.com
d162be5b5f
change video analytics to distinguish between start and resume events.
...
also scrub out any additional parameters from the videoId before passing to analytics
Change-Id: Idf3351028e62d0d03c0f680a904bb83ef8353797
2015-02-05 17:49:49 -08:00
The Android Automerger
272339e165
"LKY36"
2015-02-05 06:09:03 -08:00
The Android Automerger
a03256395f
merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev
2015-02-05 06:05:27 -08:00
The Android Automerger
8708cdaf24
"LKY35B"
2015-02-04 06:07:39 -08:00
Ying Wang
7023f614e2
am 7245b4e2
: Support dpi specific aapt flags.
...
* commit '7245b4e2bed6cef8c6bf4cc67ffd98989fde3c91':
Support dpi specific aapt flags.
2015-01-30 19:34:22 +00:00
Ying Wang
7245b4e2be
Support dpi specific aapt flags.
...
With this support, you can set dpi-specific aapt flags like:
$(LOCAL_PACKAGE_NAME)_aapt_flags_hdpi := --version-code 100 \
--version-name "100
which will override the --version-code and --version-name set in the
base apk's LOCAL_AAPT_FLAGS.
Bug := 18388705
Change-Id: Ie79d7b1b6bbf7463bce51ddae04ba81384ec58dc
2015-01-30 02:17:52 +00:00
Ying Wang
7ecc76a0f2
Support dpi specific aapt flags.
...
With this support, you can set dpi-specific aapt flags like:
$(LOCAL_PACKAGE_NAME)_aapt_flags_hdpi := --version-code 100 \
--version-name "100
which will override the --version-code and --version-name set in the
base apk's LOCAL_AAPT_FLAGS.
Bug := 18388705
Change-Id: Ie79d7b1b6bbf7463bce51ddae04ba81384ec58dc
2015-01-29 18:08:00 -08:00
Jesse Zhao
fbc8c1454e
am 0c9384d5
: Merge "verify system and vendor image together before patching." into lmp-mr1-dev
...
* commit '0c9384d512cab94b761dcb82325e4411cbaf52c0':
verify system and vendor image together before patching.
2015-01-28 23:35:57 +00:00
Jesse Zhao
0c9384d512
Merge "verify system and vendor image together before patching." into lmp-mr1-dev
2015-01-28 23:30:54 +00:00
Ying Wang
1c1497a7f6
am cb73599b
: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
...
* commit 'cb73599b25098b3513feda11ca5cb17d77fec83e':
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
2015-01-28 00:00:09 +00:00
Ying Wang
cb73599b25
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
...
It's pain to maintain an inactive product's list of
PRODUCT_FACTORY_RAMDISK_MODULES or PRODUCT_FACTORY_BUNDLE_MODULES.
Just show a warning if a module name becomes dangling.
Bug: 18779515
Change-Id: I3d137ed59feb005b186ed2a3519465da3d8f45c3
2015-01-27 15:49:21 -08:00
Ying Wang
f495c12557
am 507ea383
: Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
...
* commit '507ea383aaaea5634c79d20911773aa44324e7f5':
Let apicheck check both the public API and system API.
2015-01-22 20:41:09 +00:00
Ying Wang
507ea383aa
Merge "Let apicheck check both the public API and system API." into lmp-mr1-dev
2015-01-22 20:36:53 +00:00
Dirk Dougherty
d128388905
am 48141e05
: am 5a97f244
: am 529a107f
: Add new subtab under Distribute tab.
...
* commit '48141e05994ce939b2becab40d86482bda3d9090':
Add new subtab under Distribute tab.
2015-01-16 18:11:03 +00:00
Dirk Dougherty
48141e0599
am 5a97f244
: am 529a107f
: Add new subtab under Distribute tab.
...
* commit '5a97f24411df6ca7221343ac93f25decb99b6bea':
Add new subtab under Distribute tab.
2015-01-16 18:03:42 +00:00
Dirk Dougherty
5a97f24411
am 529a107f
: Add new subtab under Distribute tab.
...
* commit '529a107f9de5051b734fad4cecf1f971998aeade':
Add new subtab under Distribute tab.
2015-01-16 00:58:59 +00:00
Dirk Dougherty
529a107f9d
Add new subtab under Distribute tab.
...
Change-Id: I991c3295dea40629fdb9dde4a8ccbecad25f8136
2015-01-15 16:27:39 -08:00
Baligh Uddin
4117b4e3bd
am cda56ef6
: Fix default locale issue (cherry picked from commit 2a52f5c526
)
...
* commit 'cda56ef6da7216798f6791769f3e1f148bb119e2':
Fix default locale issue (cherry picked from commit 2a52f5c526
)
2015-01-12 04:07:49 +00:00
Baligh Uddin
cda56ef6da
Fix default locale issue
...
(cherry picked from commit 2a52f5c526
)
Change-Id: Ic59dd105d60c2dd44f60ed9f57b7e1381924080d
2015-01-11 23:10:44 +00:00
Ying Wang
668ae2506b
Let apicheck check both the public API and system API.
...
Also "make update-api" updates both public API and system API files.
Bug: 18960664
Change-Id: I35e805816e07c8aa4deaeb84b1611923583325e1
2015-01-09 14:23:16 -08:00
Jesse Zhao
75bcea0267
verify system and vendor image together before patching.
...
Change-Id: Ia43657ed6cd8860b0edb78cc2dd6388c761e1f8b
Bug: 17919909
2015-01-07 21:44:09 +00:00
Ying Wang
21a1f842c4
am 961096fa
: Remove ancient SDK cleanbuild rule
...
* commit '961096fadaccc38f38fb840ce621c2a1353b263c':
Remove ancient SDK cleanbuild rule
2015-01-07 02:06:27 +00:00
Ying Wang
961096fada
Remove ancient SDK cleanbuild rule
...
In anceint time we didn't have an "sdk" product so that we had to run
"make sdk" in a device product configuration.
Now we have SDK specific product configuration and we don't do "make
sdk" in device product configuration.
Change-Id: I40d58d51261498017bbe7e574c8128afc77e9b96
2015-01-06 16:49:20 -08:00
Jeff Arneson
35764d6f99
am ef789fa1
: am bb9eda64
: am 2ff97d99
: am d194c6ac
: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit 'ef789fa152d0a7649038b41b9ecf7adb1ad4d012':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 02:18:22 +00:00
Jeff Arneson
ef789fa152
am bb9eda64
: am 2ff97d99
: am d194c6ac
: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit 'bb9eda64a300bbbeffc58798f9af04d332544557':
Fix Documentation typo when showAnnotations is used with doclava
2015-01-06 02:00:09 +00:00
smain@google.com
e6bf9dcde7
am 02be1804
: am fdb9fa0e
: am 351c908b
: am 94e0b530
: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit '02be18043c1fe0a0109139caf65694a29035a1d2':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:15:30 +00:00
smain@google.com
fa963c7379
am 2fbb4e30
: am 39bac022
: am bfe3fc64
: am bf644aa5
: remove the Helpouts recruitment banner
...
* commit '2fbb4e30e26e7f3d3ec0e69075641d7343e04e13':
remove the Helpouts recruitment banner
2014-12-19 17:15:29 +00:00
smain@google.com
02be18043c
am fdb9fa0e
: am 351c908b
: am 94e0b530
: fix bug that allowed only one video in the shadowbox per page bug: 18777918
...
* commit 'fdb9fa0e2bdbcc8ffa6b33def29b74bab4ce91ac':
fix bug that allowed only one video in the shadowbox per page bug: 18777918
2014-12-19 17:08:33 +00:00
smain@google.com
2fbb4e30e2
am 39bac022
: am bfe3fc64
: am bf644aa5
: remove the Helpouts recruitment banner
...
* commit '39bac0222bf10bc9f7dd1f3d58391903d669d35a':
remove the Helpouts recruitment banner
2014-12-19 17:08:05 +00:00
Ying Wang
a1e09b1ae6
am 98ae7985
: Fix using variable intermediates.COMMON before defining.
...
* commit '98ae79853509bbc1b6ee66ace10295c5d29510c5':
Fix using variable intermediates.COMMON before defining.
2014-12-18 23:34:25 +00:00
Ying Wang
98ae798535
Fix using variable intermediates.COMMON before defining.
...
In commit e9dd9f2bf
we moved "include $(BUILD_SYSTEM)/android_manifest.mk"
forward before the variable intermediates.COMMON gets defined. That's a
mistake.
This change replaced the tentative variables
package_expected_intermediates_COMMON and guessed_intermediates with
their proper counterparts defined in base_rules.mk.
If their values differ in the two file, that's an error and we should
fix.
Bug: 18168693
Change-Id: I2bf17b0476b4a7f97810fbb0bde7630eb8878b53
2014-12-18 15:13:04 -08:00
Jeff Arneson
bb9eda64a3
am 2ff97d99
: am d194c6ac
: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
...
* commit '2ff97d99266623997c09f5af937f98bc8bb2ee65':
Fix Documentation typo when showAnnotations is used with doclava
2014-12-18 17:05:23 +00:00