Commit graph

19865 commits

Author SHA1 Message Date
The Android Automerger
4a21987df1 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-23 06:05:26 -08:00
The Android Automerger
9436b05b7c "LKY52" 2015-02-21 06:06:43 -08:00
The Android Automerger
ffd793b6a4 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-21 06:05:08 -08:00
Ying Wang
e9a2d8eb03 am 56dedc22: am dae9bb50: am 64f0f2ad: am f7cb5fc2: am 1c2ca593: am 289c9563: am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the bui
* commit '56dedc22ba137be34e0f82e097d1bdf5cd99ceed':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:50:27 +00:00
Ying Wang
56dedc22ba am dae9bb50: am 64f0f2ad: am f7cb5fc2: am 1c2ca593: am 289c9563: am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'dae9bb50a5e733221a23c8d7458165cdf34028fc':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:45:47 +00:00
Ying Wang
dae9bb50a5 am 64f0f2ad: am f7cb5fc2: am 1c2ca593: am 289c9563: am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '64f0f2ad235f1020a0f75dd91cbef9e5a622cc28':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:38:32 +00:00
Ying Wang
64f0f2ad23 am f7cb5fc2: am 1c2ca593: am 289c9563: am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'f7cb5fc2b1c38e7b12c1bb9ae348e048be3d2eeb':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:32:39 +00:00
Ying Wang
f7cb5fc2b1 am 1c2ca593: am 289c9563: am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '1c2ca59317b193d0aaaebdd8c8b7c5aefcbecc3d':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:24:41 +00:00
Ying Wang
1c2ca59317 am 289c9563: am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '289c9563e396f9b9d49487dc8807318fc7542549':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:19:18 +00:00
Ying Wang
289c9563e3 am 6be36e0c: am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '6be36e0c5eb9ff65727b8f90591ba594deb040b4':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:09:45 +00:00
Ying Wang
6be36e0c5e am 7447c516: am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '7447c516722041d8df4cf18571f148aac6a57eb9':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 19:00:00 +00:00
Ying Wang
7447c51672 am 89a0e52e: am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '89a0e52e4097b2a080292ae65d39db05aceed500':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:53:06 +00:00
Ying Wang
89a0e52e40 am 01b35afe: am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '01b35afe186050fd6140ad758a18ce13c9008c22':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:45:36 +00:00
Ying Wang
01b35afe18 am a9c86ef0: am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'a9c86ef0959b50043503ab39608ab25c7cdc94b2':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:38:29 +00:00
Ying Wang
a9c86ef095 am f7bb2237: am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'f7bb2237c72d668068c6af0234311aeb096a2af2':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:32:20 +00:00
Ying Wang
f7bb2237c7 am f2ac0682: am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'f2ac06828e41578bd13434fee7fcfee0f76419f9':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:28:48 +00:00
Ying Wang
f2ac06828e am 7eba7cc4: am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit '7eba7cc49b527d6d6605810c1de497c4477db03f':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:23:29 +00:00
Ying Wang
7eba7cc49b am fe3eeb8c: am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'fe3eeb8cf0fd03d020a0b49c4def441056eae157':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:18:07 +00:00
Ying Wang
fe3eeb8cf0 am c5ec654c: am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'c5ec654c6edb01c129c5371321fba1cc6e28940d':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:13:23 +00:00
Ying Wang
c5ec654c6e am c646bbfb: We shouldn\'t use temporary variable in the build recipe.
* commit 'c646bbfbd6e5d9ea1826199ca43aae1f922074dc':
  We shouldn't use temporary variable in the build recipe.
2015-02-20 18:05:42 +00:00
The Android Automerger
aebd9cce59 "LKY51" 2015-02-20 06:06:26 -08:00
The Android Automerger
b3700c347b merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-20 06:05:17 -08:00
Ying Wang
c646bbfbd6 We shouldn't use temporary variable in the build recipe.
Use $@ instead.

Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
(cherry picked from commit b8a256a1fa)
2015-02-20 01:49:32 +00:00
The Android Automerger
adafbf8896 "LKY50" 2015-02-19 06:06:27 -08:00
The Android Automerger
d65134bf15 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-19 06:05:10 -08:00
The Android Automerger
8d2a26eb32 "LKY49" 2015-02-18 06:06:33 -08:00
The Android Automerger
d23a2c4600 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-18 06:05:10 -08:00
The Android Automerger
b34979a5a3 "LKY48" 2015-02-17 06:05:52 -08:00
The Android Automerger
bf0ec53d06 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-17 06:05:16 -08:00
The Android Automerger
d5ba03a05a "LKY47" 2015-02-16 06:05:48 -08:00
The Android Automerger
d89eb9f9e0 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-16 06:05:25 -08:00
The Android Automerger
ca274c9ffb "LKY45" 2015-02-14 06:05:39 -08:00
The Android Automerger
f543c69196 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-14 06:05:09 -08:00
Justin Harrison
070eea05f2 am ffd4fee9: Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev
* commit 'ffd4fee911ee43fbec7b08b829d15a7593421dba':
  Revert "Allow system images larger than 2GiB."
2015-02-13 20:23:29 +00:00
Justin Harrison
ffd4fee911 Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev 2015-02-13 18:48:17 +00:00
Justin Harrison
2de68bbbf4 Revert "Allow system images larger than 2GiB."
This reverts commit cd082d4bfe.

Change-Id: Ie63e1ba70d907d2849164871bc7ec71c245f7af9
2015-02-13 18:47:51 +00:00
The Android Automerger
1cf30e247c "LKY44" 2015-02-13 06:06:53 -08:00
The Android Automerger
9de81505a2 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-13 06:05:11 -08:00
Ying Wang
a8b9a8c1ed am 1f58c417: Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
* commit '1f58c41742b6a063138226e6483010486f56657f':
  Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
2015-02-12 22:46:54 +00:00
Ying Wang
1f58c41742 Support LOCAL_PREBUILT_JNI_LIBS in unbundled build.
Package up LOCAL_PREBUILT_JNI_LIBS when you do tapas (apps_only) build.

Change-Id: Ibdc920fee22d4940eebee080a940e8e9492c06cb
(cherry picked from commit e66d7c1de0)
2015-02-12 22:40:24 +00:00
The Android Automerger
9d188197c2 "LKY43" 2015-02-12 06:07:21 -08:00
The Android Automerger
82a99f1752 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-02-12 06:05:23 -08:00
bohu
d857abd1ff am 151205c3: Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev
* commit '151205c37fc14201cf9be99e5083d467075a1ba0':
  Bump generic_mips and generic_x86_64 system partition size
2015-02-12 01:04:48 +00:00
bohu
151205c37f Merge "Bump generic_mips and generic_x86_64 system partition size" into lmp-mr1-dev 2015-02-12 00:59:27 +00:00
bohu
4c49eaadf3 Bump generic_mips and generic_x86_64 system partition size
This fixes the sdk_google_phone_mips and sdk_google_phone_x86-64
builds

Change-Id: I971d02b07a6aa917d7e0f3750b48e657205aae52
2015-02-11 16:51:54 -08:00
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