openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
24,807 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

1447 Commits

Author SHA1 Message Date
Jeff Sharkey e95d555c12 am c79068be: am c2fb6e10: Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev 
* commit 'c79068be5c90aefedcb2e171e8700eace4e8f05c':
  Both ext4 and f2fs binaries for adoptable storage.
 2015-05-29 05:15:59 +00:00
Jeff Sharkey c2fb6e107d Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev 2015-05-28 19:54:17 +00:00
bohu 9db8d53432 am bb1ead79: am 1d8b2702: Include fingerprintd on emulator images 
* commit 'bb1ead7920ad5bb98d6989a763d242826663e241':
  Include fingerprintd on emulator images
 2015-05-28 02:38:04 +00:00
bohu 1d8b270267 Include fingerprintd on emulator images 
Change-Id: I453d7d3fa3844bdb26c8279982b8b5b246032926
 2015-05-27 17:53:11 -07:00
Jeff Sharkey e819398870 Both ext4 and f2fs binaries for adoptable storage. 
New adoptable storage feature can format media as either ext4 or
f2fs, so bring in both sets of binaries for typical products.

Bug: 20275581
Change-Id: I85380cbc8c06c958b66db879f63447ddac124cbf
 2015-05-27 14:44:30 -07:00
bohu dffeda6f2a am ba90e314: am ed6b6350: Uses SDK specific feature lists for SDK system images 
* commit 'ba90e314b136c24013a73528c028db35e51cf738':
  Uses SDK specific feature lists for SDK system images
 2015-05-23 00:02:57 +00:00
bohu cf7da13202 am 00005546: am 2913ecc2: Merge "Replace Launcher2 by Launcher3 for SDK system images" into mnc-dev 
* commit '000055468ef1c3cb43f04ab0ae2af3ffa1288318':
  Replace Launcher2 by Launcher3 for SDK system images
 2015-05-22 22:55:42 +00:00
bohu ed6b6350ea Uses SDK specific feature lists for SDK system images 
The SDK system images does not have some features such as bluetooth;
From now on, it will use its own feature list from
device/generic/goldfish/data/etc/handheld_core_hardware.xml

bug: 21159206
Change-Id: If566d4d190dc307c6d16844dba0d17570f0ceebf
 2015-05-22 15:38:13 -07:00
bohu 9b2323edf7 Replace Launcher2 by Launcher3 for SDK system images 
Launcher2 is deprecated and should use Launcher3, as the latter
can handle higher resolution devices (such as Nexus 6).

Change-Id: I5215d87f8536869486bb0b6317ae382a21099925
 2015-05-22 15:05:12 -07:00
Guang Zhu 7ebd604697 am 7b4d4b90: am 7fda3158: Merge "Revert "Replace Launcher2 with Launcher3"" into mnc-dev 
* commit '7b4d4b9040562cd7284b4f9807af0154380a42cc':
  Revert "Replace Launcher2 with Launcher3"
 2015-05-22 16:50:45 +00:00
Guang Zhu 7fda31584f Merge "Revert "Replace Launcher2 with Launcher3"" into mnc-dev 2015-05-22 02:12:40 +00:00
Guang Zhu ed9edb9c29 Revert "Replace Launcher2 with Launcher3" 
Bug: 21164174

This reverts commit d79778faf3.

Change-Id: Ide6b2dc4c511a60bcdf22dd44369e3a9fa08d1af
 2015-05-22 02:08:19 +00:00
Andres Morales 5ddb1a5234 am d57d6a23: am 7451df69: Merge "remove gatekeeper software module" into mnc-dev 
* commit 'd57d6a235c1ac991bb7429b60751e4fc84b6b194':
  remove gatekeeper software module
 2015-05-21 19:10:17 +00:00
bohu 875025e5ce am 0e9dc94f: am d79778fa: Replace Launcher2 with Launcher3 
* commit '0e9dc94f26b1903b17c571ccaf274ebc5912e6af':
  Replace Launcher2 with Launcher3
 2015-05-21 19:10:16 +00:00
Andres Morales 7451df690c Merge "remove gatekeeper software module" into mnc-dev 2015-05-21 18:27:52 +00:00
bohu d79778faf3 Replace Launcher2 with Launcher3 
Launcher2 is deprecated and should use Launcher3, as the latter
can handle higher resolution devices (such as Nexus 6).
Most importantly, Launcher3 is maintained.

Change-Id: I3a80f242af2baaebe90af93794b0ba5e249dbc7d
 2015-05-21 08:16:14 -07:00
Andres Morales f1d32a1e14 remove gatekeeper software module 
now implemented directly in gatekeeperd binary

Change-Id: Iaeb8e97427dbcffd1356fa955d61af55e3e330ec
 2015-05-18 09:24:44 -07:00
Neil Fuller abf5ef8fdd Merge "Add tzdatacheck to image" 2015-05-15 09:09:46 +00:00
Neil Fuller affc8164ea am b0bc4628: am f9f9c3f3: Merge "Add tzdatacheck to image" into mnc-dev 
* commit 'b0bc462877f4c25a1a86a23c4b673bd75890976a':
  Add tzdatacheck to image
 2015-05-14 21:25:53 +00:00
Neil Fuller 84b983a7ef Add tzdatacheck to image 
Bug: 21110439
Bug: 19941636
(cherry picked from commit 7d18a68417)

Change-Id: I29ab303d2695ba1cadf70c2d2f4440d34a8cede9
 2015-05-14 12:02:58 +01:00
Neil Fuller f9f9c3f31e Merge "Add tzdatacheck to image" into mnc-dev 2015-05-14 10:15:01 +00:00
Neil Fuller 7d18a68417 Add tzdatacheck to image 
Bug: 21110439
Bug: 19941636
Change-Id: I743236d9c7b433968865648ffae25451c6012a5f
 2015-05-14 10:15:35 +01:00
Geoff Mendal 8bf68d59b7 am 06b07daa: am 8788add7: Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release} Bug: 21095280 
* commit '06b07daa70cfd10a8154769c895b05fe22a1e582':
  Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release} Bug: 21095280
 2015-05-13 17:39:28 +00:00
Geoff Mendal 8788add72c Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release} 
Bug: 21095280
 2015-05-13 09:57:01 -07:00
Jeff Sharkey f3d8574181 am 7d7dbece: am 3ce2e60f: Merge "New "sm" shell tool to call StorageManager." into mnc-dev 
* commit '7d7dbece3a7cd3c63e7aec610754b7bd9153d9a2':
  New "sm" shell tool to call StorageManager.
 2015-05-13 05:48:44 +00:00
Jeff Sharkey 3ce2e60ffc Merge "New "sm" shell tool to call StorageManager." into mnc-dev 2015-05-13 05:27:39 +00:00
Jeff Sharkey dea22725d4 New "sm" shell tool to call StorageManager. 
Bug: 19993667
Change-Id: I9021794eb6f69c7f53151a887a85788d315ab67d
 2015-05-12 15:53:29 -07:00
Dan Albert c6355b9464 Remove stlport from global package list. 
This is now whitelisted per device.

Bug: http://b/15193147
Change-Id: I7fcd0891242fb552a17753b151cf431a398bbc44
(cherry picked from commit 0a93b56924)
 2015-05-08 09:56:56 -07:00
Robin Lee 54840d8906 am 55125372: am 455ffaaf: Revert "Switch from Calculator to ExactCalculator" 
* commit '551253726f7c3c5e5ec475ce84749b1b9e9453cc':
  Revert "Switch from Calculator to ExactCalculator"
 2015-05-07 18:30:15 +00:00
Robin Lee 551253726f am 455ffaaf: Revert "Switch from Calculator to ExactCalculator" 
* commit '455ffaafcd5b6d0296bfa6143baccb01c84e2382':
  Revert "Switch from Calculator to ExactCalculator"
 2015-05-07 17:49:30 +00:00
Dan Albert 3e6d7b145a am 052b9c4d: am 6a876676: am 0e8413e4: Merge "Remove stlport from global package list." 
* commit '052b9c4d42c5bb69d889670a66ac4f2747d251dd':
  Remove stlport from global package list.
 2015-05-07 17:17:54 +00:00
Dan Albert 052b9c4d42 am 6a876676: am 0e8413e4: Merge "Remove stlport from global package list." 
* commit '6a876676f02d51c3fc346e5fc4d7a4b656f39340':
  Remove stlport from global package list.
 2015-05-07 15:58:30 +00:00
Robin Lee 455ffaafcd Revert "Switch from Calculator to ExactCalculator" 
Temporary revert to get TT builds in shape.

This reverts commit 846505dc35.

Bug: 20745303
Change-Id: Id3455cba38b7aabaffa63c8531a6430f69897c6e
 2015-05-07 14:56:00 +00:00
Dan Albert 0a93b56924 Remove stlport from global package list. 
This is now whitelisted per device.

Bug: http://b/15193147
Change-Id: I7fcd0891242fb552a17753b151cf431a398bbc44
 2015-05-06 13:21:51 -07:00
Michael Wright 345ee05e77 Add input HAL to device builds 
Change-Id: I11d1624947dcc3cdcd0d648de6cc25901c91dac6
 2015-04-27 10:19:47 -07:00
Justin Klaassen f33b404cb6 Merge "Switch from Calculator to ExactCalculator" 2015-04-18 00:24:23 +00:00
Lajos Molnar 3456d3bbf7 am d6ba1cfd: am 35790525: am 3a5602eb: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs" 
* commit 'd6ba1cfdfb0c1792e2f2f1de5bd2c596a41a47cc':
  core_base.mk: switch to new H264 and MPEG2 software codecs
 2015-04-17 06:13:31 +00:00
Lajos Molnar f623a80480 core_base.mk: switch to new H264 and MPEG2 software codecs 
Change-Id: I3078a4ef6e73e95edcdd16b087ac61ae56c4b812
 2015-04-16 19:02:47 -07:00
Justin Klaassen 846505dc35 Switch from Calculator to ExactCalculator 
Bug: 20301980
Change-Id: I95373aba826a0b5d58d2845b77e9849b674c5ed3
 2015-04-16 17:28:05 -07:00
Jonathan Basseri 3dd39b092b Adding the new CarrierConfig app to the system image. 
Bug: b/19483786
Change-Id: I0173246997d6edddf4d9afb508a2427818f71928
 2015-04-16 10:25:03 -07:00
Lajos Molnar 7ac7dc7263 am 8cd7e944: am fb102b1b: am 7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"" 
* commit '8cd7e9442cfbd8247bb99c312f6e98649b3afe42':
  Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
 2015-04-16 16:40:35 +00:00
Lajos Molnar 37e931d9c3 Revert "core_base.mk: switch to new H264 and MPEG2 software codecs" 
clang builds fail on the dependent libraries

This reverts commit c628500ca5.

Change-Id: Ibd4cdce82b890bd3cb9d03a1a1bc0e4fc0e22ee8
 2015-04-16 15:49:08 +00:00
Lajos Molnar 2578431911 am ec1c2c0f: am b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs" 
* commit 'ec1c2c0fea5b82ecf480d32dd3679f8437f720eb':
  core_base.mk: switch to new H264 and MPEG2 software codecs
 2015-04-16 15:45:56 +00:00
Lajos Molnar c628500ca5 core_base.mk: switch to new H264 and MPEG2 software codecs 
Change-Id: I86777e5efc7dbb138e9348a4ec7271ff047d328f
 2015-04-15 16:18:53 -07:00
Ying Wang 3b2f1fc7c6 am 414bb9a4: am 78622230: am 47ff7f56: Merge "Add host tool fastboot to every build." 
* commit '414bb9a4823c44e2f4927f052678e56935d3a9af':
  Add host tool fastboot to every build.
 2015-04-13 22:51:29 +00:00
Ying Wang 9668a7ab1d Add host tool fastboot to every build. 
Some tools expect fastboot to be present even in user builds.

Change-Id: I4b6ee458eb2feb0dc7a77ec33a04219c5f4adc0d
 2015-04-13 14:49:19 -07:00
Ricardo Garcia 3b216991a7 Adding libsonic to base.mk 
Adding Sonic library to base
bug: 19196501

Change-Id: Id39a3a2f843aadf2808a10d2017151461db2c9b2
 2015-04-10 15:43:30 -07:00
Andres Morales 452196f8a0 Merge "Add gatekeeperd to build" 2015-04-10 14:46:05 +00:00
Andres Morales c7f7125b00 Merge "Add GateKeeper to core build" 2015-04-10 14:45:27 +00:00
Sami Tolvanen e18196095b Merge "Separate boot and recovery image signing from dm-verity" 2015-04-10 09:44:47 +00:00
Narayan Kamath 96c872d5e3 Merge "Track renaming of org.apache.http.legacy.jar" 2015-04-10 08:16:01 +00:00
Mike Lockwood 70e60b63a0 Merge "Add BluetoothMidiService to generic_no_telephony.mk" 2015-04-09 21:05:11 +00:00
Narayan Kamath bf72f679d6 Track renaming of org.apache.http.legacy.jar 
Change-Id: I224a4883474f81039df2203eb17272bc994c04c8
 2015-04-09 13:12:09 +01:00
Roozbeh Pournader cf6a4d8004 Merge "Add hyphenation patterns to generic_no_telephony.mk." 2015-04-09 02:12:54 +00:00
Joseph Wen e1c8bdf8d8 Merge "Add StatementService to the build" 2015-04-08 18:47:07 +00:00
Joseph Wen 3a260d6860 Add StatementService to the build 
- this is related to IntentFilter auto verification in Framework

Change-Id: I83d1c4bcc7be7992509348098cc320e38efea862
 2015-04-08 10:55:27 -04:00
Sami Tolvanen 8b3f08bc7b Separate boot and recovery image signing from dm-verity 
Allow dm-verity to be enabled without boot and recovery images being
signed. This makes it possible to enable only dm-verity to detect
corruption without confusing bootloaders that do not understand signed
images.

Bug: 19985143
Change-Id: Ie52c6ff595faa7a5c1f1bc1b37f6899c4d0c7001
 2015-04-08 12:30:16 +01:00
Roozbeh Pournader fe4b3b185d Add hyphenation patterns to generic_no_telephony.mk. 
They should be included on all devices.

Bug: 20088132
Change-Id: I83bb2b018090bb9e76ea68ffad69f5e649d82be3
 2015-04-07 09:13:21 -07:00
Andres Morales d2c9d453ef Add gatekeeperd to build 
Change-Id: I84fb2b2ffee43f81d7fc2081fec225d6dc94f9c1
 2015-04-06 17:23:23 -07:00
Andres Morales f886fee685 Add GateKeeper to core build 
This is built from system/gatekeeper/softgatekeeper.

It will represent the core native library for
validating device Pin/Pattern/Password.

Change-Id: I927c17042e59076eb7867b8855c2970b1c289307
 2015-04-06 17:22:36 -07:00
Roozbeh Pournader 622b9ee784 Remove Lohit fonts from the build. 
There are no remaining fonts to be built from Lohit. They are all
replaced by Noto.

Change-Id: I694e48cec194735c176083e4f4b7491a1079f74c
 2015-04-06 12:43:04 -07:00
Mike Lockwood 0c651c52d6 Add BluetoothMidiService to generic_no_telephony.mk 
Change-Id: I4ffa78c19e089074b33ade8c6a9881bf7186301e
 2015-04-01 14:16:48 -07:00
Fabrice Di Meglio 6696172bad Merge "Add IntentFilterVerifier to the build" 2015-03-31 00:20:12 +00:00
Nicholas Sauer e4f3956252 Remove mms-common from tiny and minimal builds to fix the pdk build. 
mms-common was replaced with telephony-common over several CLs including
ag/496311. the current mms-common project is merely a dummy class used
to satisfy legacy build targets. i confirmed with ywen@ that it is no
longer needed.

Change-Id: I70302abe4d1312847341bbda4976c489af2e32e3
 2015-03-27 17:54:08 +00:00
David Riley 17be3d3921 Add support to sign boot images with vboot. 
Change-Id: I924468fe06f7d38d4fc49c2ae9dfee734fd58867
Signed-off-by: David Riley <davidriley@google.com>
(cherry picked from commit 14fb7236c1942a9f5050b3e608a0f5f4cd1cae1d)
 2015-03-26 17:54:40 +00:00
bohu bb49bc5417 Merge "Add fingerprint HAL to emulator system images" 2015-03-26 17:39:54 +00:00
bohu a2005ae47d Add fingerprint HAL to emulator system images 
This will build fingerprint.goldfish.so and fingerprint.ranchu.so
HALs for emulator system images and put them into the hw/
directory.

Change-Id: I6959d4b8e99ea0476c324c01ff05e44716ad8fa1
 2015-03-26 10:16:42 -07:00
Paul Miller 99fbd82028 am 5bd58691: am 23588104: am 971e5787: Merge "Revert "Replace legacy Browser with BookmarkProvider"" 
* commit '5bd5869115fa80cc4a94752e160d3df001d6d3d6':
  Revert "Replace legacy Browser with BookmarkProvider"
 2015-03-23 22:55:27 +00:00
Paul Miller 971e5787c0 Merge "Revert "Replace legacy Browser with BookmarkProvider"" 2015-03-20 21:08:49 +00:00
Paul Miller 54dfc3fc22 Revert "Replace legacy Browser with BookmarkProvider" 
This reverts commit 6169022417.

Change-Id: I0246ef7a89de08bc449509b39f8db8279ea0871e
BUG:19351071
 2015-03-20 16:26:26 +00:00
Narayan Kamath e18445ead8 am 4de176b8: am 2002102e: am ad22a8f2: Merge "Remove VoiceDialer from PRODUCT_PACKAGE list." 
* commit '4de176b888f7dda32e1a3d01fb9add7a1774f080':
  Remove VoiceDialer from PRODUCT_PACKAGE list.
 2015-03-20 09:23:50 +00:00
Narayan Kamath ad22a8f2a7 Merge "Remove VoiceDialer from PRODUCT_PACKAGE list." 2015-03-20 08:53:09 +00:00
Paul Miller 8b01ac4a59 am a6726d1f: am e601f1ec: am d121f184: Merge "Replace legacy Browser with BookmarkProvider" 
* commit 'a6726d1f3001b84c51da523d09f079274e39902e':
  Replace legacy Browser with BookmarkProvider
 2015-03-19 20:42:54 +00:00
Narayan Kamath fadee109d6 Remove VoiceDialer from PRODUCT_PACKAGE list. 
Change-Id: Ibc86ddee90a9ff83c3cdcbf086a6a1e466ba5088
 2015-03-19 18:10:15 +00:00
Paul Miller 6169022417 Replace legacy Browser with BookmarkProvider 
BookmarkProvider is Browser's old provider code, refactored into its
own app.

BUG:19351071
Change-Id: I0a5e1f2fc54749e2d3e3442636a26b2459b600c6
 2015-03-18 15:44:21 -07:00
Elliott Hughes e0203b17fa am bf8164f9: am 47584657: am 0f98a378: Merge "Remove netcfg from the list of base modules." 
* commit 'bf8164f938f0af98b76e481de6c415fa496cfe21':
  Remove netcfg from the list of base modules.
 2015-03-17 14:47:28 +00:00
Elliott Hughes f3124b3523 Remove netcfg from the list of base modules. 
It's obsolete and -- other than a mention in the reference RIL and
another in a shell script that no longer works -- unused.

Change-Id: Ibbf2613778802222865528644c7e59a2d7c68b48
 2015-03-16 13:52:30 -07:00
Eric Laurent 3131486892 Merge "added broadcast radio service" 2015-03-16 18:29:05 +00:00
Ying Wang f25838a7ea Support modules to be installed directly to recovery.img 
Previously the recovery binary was configured to be installed to the
system.img and then got copied to recovery.img in the recovery.img's
build rule.
With this change, a module, such as the recovery binary, can configure
itself to be installed directly to the recovery.img, just like how other
modules get installed to system.img.

Bug: 19667686
Change-Id: I46b0b4a95cf078a68999db9c0f6635d6a3f5cd86
 2015-03-11 10:38:13 -07:00
Ying Wang 3752614de1 Support modules to be installed directly to recovery.img 
Previously the recovery binary was configured to be installed to the
system.img and then got copied to recovery.img in the recovery.img's
build rule.
With this change, a module, such as the recovery binary, can configure
itself to be installed directly to the recovery.img, just like how other
modules get installed to system.img.

Bug: 19667686
Change-Id: I46b0b4a95cf078a68999db9c0f6635d6a3f5cd86
 2015-03-10 12:02:57 -07:00
Santos Cordon 386fa7350a Add Call Log backup to basic telephony spec. 
Change-Id: I9c101044a7750141a01e3a7e5c6ed127471f10bc
 2015-03-06 12:45:05 -08:00
Eric Laurent 5793ad8a47 added broadcast radio service 
Added core libraries for broacast radio service, client
and meta data utility.

Change-Id: Ic93444aee9a41c02dce67c8170450ac111332a62
 2015-03-05 16:59:39 -08:00
Roozbeh Pournader 3ab85e4783 Add Roboto fonts 
Roboto fonts are now moved to external/roboto-fonts.

Change-Id: Ic42bc5f7e645a66b3cf5c2ab61a6b5e9bde1b7cd
 2015-02-25 16:39:22 -08:00
Tim Kilbourn d0731048d6 Remove inputflinger binary from builds. 
Change-Id: I98b19c532a2329a867c9943c13aa471bda01568c
 2015-02-23 23:44:09 -08:00
Fabrice Di Meglio b9051dae41 Add IntentFilterVerifier to the build 
- this is related to IntentFilter auto verification in Framework

Change-Id: Ifb318ff96e15054467d8cd150678d5ea740f221d
 2015-02-24 01:25:34 +00:00
Jeff Sharkey aa438dc4cf Include sgdisk in all device builds. 
sgdisk is the command line version of gptfdisk, which we're using
to format devices with the GUID partition table standard.

Change-Id: I99e0c56d35391d46031d1c2f04956332e1a164a9
 2015-02-23 10:06:56 -08:00
Narayan Kamath af439891e9 Merge "Temporarily add org.apache.http.legacy to the boot classpath." 2015-02-11 14:48:03 +00:00
Jorim Jaggi 050f21cb00 Merge "Split up android.policy into framework.jar and services.jar 3/3" 2015-02-10 14:15:20 +00:00
Narayan Kamath 2011e895dc Temporarily add org.apache.http.legacy to the boot classpath. 
This change is the stepping stone towards removing it altogether.
In order to remove it, we need a few changes to ART to properly
support compile time classpaths.

bug: 18027885
Change-Id: I70d5453ff88b8ba51c418fd72aaf78ac97869502
 2015-02-10 13:45:06 +00:00
Elliott Hughes 4244392ea9 am 57555891: am ed556858: Merge "Make sure we keep building grep now it\'s broken out from toolbox." 
* commit '5755589141358a4f82cada56e6738075c670011f':
  Make sure we keep building grep now it's broken out from toolbox.
 2015-02-05 20:15:59 +00:00
Elliott Hughes 5755589141 am ed556858: Merge "Make sure we keep building grep now it\'s broken out from toolbox." 
* commit 'ed556858262a7311f0145f1d1c605f7cec7c18c4':
  Make sure we keep building grep now it's broken out from toolbox.
 2015-02-05 18:47:21 +00:00
Jorim Jaggi a514472bce Split up android.policy into framework.jar and services.jar 3/3 
Change-Id: I2943e73ae5b59bb457e164bc4de2e92724686376
 2015-02-05 16:42:19 +01:00
Elliott Hughes c00dedb21c Make sure we keep building grep now it's broken out from toolbox. 
Change-Id: Ib71e37c5ba238136a9790cd92ecec745e099341e
 2015-02-04 18:56:17 -08:00
Elliott Hughes 954baa1fff am 21a0c862: am 67c4d916: Merge "Remove unused property." 
* commit '21a0c8629ced53bdfddfe5ece8cb4fca2d92c351':
  Remove unused property.
 2015-01-29 18:37:35 +00:00
Elliott Hughes 21a0c8629c am 67c4d916: Merge "Remove unused property." 
* commit '67c4d916f5294e47e3da275664bb55f4518300f3':
  Remove unused property.
 2015-01-29 16:51:52 +00:00
Elliott Hughes 7419722205 Remove unused property. 
Change-Id: I14cfccf104881fdbca2b926e289b90e4bfad1c32
 2015-01-28 22:43:43 -08:00
Ying Wang 7761e78451 am 79834f37: am ae542c78: Merge "Revert "Add the default local_time hal implementation to builds."" 
* commit '79834f371ea13475577e4babd2c3960aefb5a2a2':
  Revert "Add the default local_time hal implementation to builds."
 2015-01-22 19:58:04 +00:00
Ying Wang 4d26681f3d resolved conflicts for merge of 0f205ad9 to master 
Change-Id: Ic741805a0037d8d29d7d5ff6e2b6e83067943f12
 2015-01-22 11:54:58 -08:00
Ying Wang 79834f371e am ae542c78: Merge "Revert "Add the default local_time hal implementation to builds."" 
* commit 'ae542c785d11f1e62f20f4493e422fdf5749d397':
  Revert "Add the default local_time hal implementation to builds."
 2015-01-22 00:13:34 +00:00
David Turner b6af64c3ea am 8be358bf: Merge "emulator: Include the ranchu sensors library" 
* commit '8be358bf9a5407a379d4c4709c172b8c1ba6d4c7':
  emulator: Include the ranchu sensors library
 2015-01-22 00:13:32 +00:00