OSDN Git Service
Brian Carlstrom [Mon, 15 Jul 2013 23:44:26 +0000 (16:44 -0700)]
Add LOCAL_ADDITIONAL_DEPENDENCIES support to BUILD_PHONY_PACKAGE
Change-Id: I0211600ebb554b55f3823a4cb3d119b95cb49733
The Android Open Source Project [Mon, 15 Jul 2013 16:34:24 +0000 (09:34 -0700)]
am
ccf2f3dd: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
ccf2f3dd142d0ad973d913990a358d7fc6af2a8d':
"JSS15"
The Android Open Source Project [Mon, 15 Jul 2013 16:32:27 +0000 (09:32 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I2c1659dba0eea86a4a76ee410608febbae466ef2
Ying Wang [Mon, 15 Jul 2013 16:04:42 +0000 (09:04 -0700)]
am
6e9151b1: am
988251c9: Fix error.
* commit '
6e9151b1a7e035936cf671c83cf25fe7351e3c06':
Fix $(so_suffix) error.
Ying Wang [Mon, 15 Jul 2013 16:01:59 +0000 (09:01 -0700)]
am
988251c9: Fix error.
* commit '
988251c92269676c891dcb548fecdc100755b431':
Fix $(so_suffix) error.
Ying Wang [Mon, 15 Jul 2013 15:47:33 +0000 (08:47 -0700)]
Fix $(so_suffix) error.
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
(cherry picked from commit
80b71fa326e4b5d9510d528c8feb08e28376a350)
Ying Wang [Mon, 15 Jul 2013 15:49:09 +0000 (15:49 +0000)]
Merge "Fix $(so_suffix) error."
Ying Wang [Mon, 15 Jul 2013 15:47:33 +0000 (08:47 -0700)]
Fix $(so_suffix) error.
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
The Android Automerger [Mon, 15 Jul 2013 15:19:51 +0000 (08:19 -0700)]
"JSS15"
The Android Automerger [Mon, 15 Jul 2013 15:18:59 +0000 (08:18 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Mon, 15 Jul 2013 14:36:54 +0000 (07:36 -0700)]
am
8c20de34: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
8c20de34bd3302b6a594b33afab4ff90303a5dde':
"JSS11I"
"JSS11H"
"JSS11G"
The Android Open Source Project [Mon, 15 Jul 2013 14:35:31 +0000 (07:35 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id93477c002befa42eda6aafe3a71323e28ca8ab0
The Android Automerger [Sat, 13 Jul 2013 07:53:18 +0000 (00:53 -0700)]
"JSS11I"
Ying Wang [Sat, 13 Jul 2013 05:37:34 +0000 (22:37 -0700)]
am
3aa8eb68: am
ba9636d4: Establish the built module dependencies on prebuilt shared library
* commit '
3aa8eb6810e523f6056da58079f65e5fbcd628d0':
Establish the built module dependencies on prebuilt shared library
Ying Wang [Sat, 13 Jul 2013 05:34:46 +0000 (22:34 -0700)]
am
ba9636d4: Establish the built module dependencies on prebuilt shared library
* commit '
ba9636d47fdc91c4caca6c9e0ad618956ddbb98b':
Establish the built module dependencies on prebuilt shared library
Ying Wang [Sat, 13 Jul 2013 05:05:14 +0000 (22:05 -0700)]
Establish the built module dependencies on prebuilt shared library
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.
Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
(cherry picked from commit
ada8f296570e0bda93b433a7aa86ad138dd1705e)
Ying Wang [Sat, 13 Jul 2013 05:10:32 +0000 (05:10 +0000)]
Merge "Establish the built module dependencies on prebuilt shared library"
Ying Wang [Sat, 13 Jul 2013 05:05:14 +0000 (22:05 -0700)]
Establish the built module dependencies on prebuilt shared library
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.
Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
Nick Kralevich [Sat, 13 Jul 2013 03:48:32 +0000 (20:48 -0700)]
am
4e76f806: am
a682f6db: am
4e132ca5: Merge "emulator: increase system partition to 550M"
* commit '
4e76f806d49c0b4e7fa31653555a5a16713a8778':
emulator: increase system partition to 550M
Nick Kralevich [Sat, 13 Jul 2013 03:46:51 +0000 (20:46 -0700)]
am
a682f6db: am
4e132ca5: Merge "emulator: increase system partition to 550M"
* commit '
a682f6db7b3e1259ce4abc829bd6763850565494':
emulator: increase system partition to 550M
Nick Kralevich [Sat, 13 Jul 2013 03:44:41 +0000 (20:44 -0700)]
am
4e132ca5: Merge "emulator: increase system partition to 550M"
* commit '
4e132ca5e5c5048d7a95563eddd9f5ef11346678':
emulator: increase system partition to 550M
Nick Kralevich [Sat, 13 Jul 2013 03:42:05 +0000 (03:42 +0000)]
Merge "emulator: increase system partition to 550M"
Nick Kralevich [Sat, 13 Jul 2013 03:28:59 +0000 (20:28 -0700)]
emulator: increase system partition to 550M
Yes, 400M isn't enough. I can't believe it either.
Change-Id: I7d3857f04bfda472af6a281017204672bb9c9940
The Android Automerger [Sat, 13 Jul 2013 01:49:06 +0000 (18:49 -0700)]
"JSS11H"
The Android Automerger [Sat, 13 Jul 2013 00:10:48 +0000 (17:10 -0700)]
"JSS11G"
Nick Kralevich [Fri, 12 Jul 2013 22:20:30 +0000 (15:20 -0700)]
am
38437bad: am
e9ee5e11: am
5411ef9c: Merge "emulator: increase system partition size to 400M"
* commit '
38437bade23ff6fc5fe5c30dacebc178c56d47ba':
emulator: increase system partition size to 400M
Nick Kralevich [Fri, 12 Jul 2013 22:17:20 +0000 (15:17 -0700)]
am
e9ee5e11: am
5411ef9c: Merge "emulator: increase system partition size to 400M"
* commit '
e9ee5e11b499f5be72b365585001e310b776d698':
emulator: increase system partition size to 400M
Nick Kralevich [Fri, 12 Jul 2013 22:15:33 +0000 (15:15 -0700)]
am
5411ef9c: Merge "emulator: increase system partition size to 400M"
* commit '
5411ef9cc4a4bf5c1950df89f2b2032edcf83dc8':
emulator: increase system partition size to 400M
Nick Kralevich [Fri, 12 Jul 2013 22:14:02 +0000 (22:14 +0000)]
Merge "emulator: increase system partition size to 400M"
The Android Open Source Project [Fri, 12 Jul 2013 21:55:01 +0000 (14:55 -0700)]
am
29b708aa: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
29b708aac70b694879d4867e1943926716a08fea':
JSS11F
"JSS11E"
The Android Open Source Project [Fri, 12 Jul 2013 21:52:07 +0000 (14:52 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I2025eb92f81ab9ce86e3f894f3e25eb5ca4266ec
Nick Kralevich [Fri, 12 Jul 2013 20:44:48 +0000 (13:44 -0700)]
emulator: increase system partition size to 400M
300M is too small.
Change-Id: Icbe4e76d6e5c8a50cc6e6d74e324335bc66b8466
The Android Automerger [Fri, 12 Jul 2013 19:19:57 +0000 (12:19 -0700)]
JSS11F
Ying Wang [Fri, 12 Jul 2013 18:14:28 +0000 (11:14 -0700)]
am
263359df: am
6685bd01: am
2476ec99: Merge "use ext4 instead of yaffs for the emulator"
* commit '
263359df4399e86a26a70711b8004b54c8fe44b0':
use ext4 instead of yaffs for the emulator
Ying Wang [Fri, 12 Jul 2013 18:12:49 +0000 (11:12 -0700)]
am
6685bd01: am
2476ec99: Merge "use ext4 instead of yaffs for the emulator"
* commit '
6685bd01a953a550f0cebe342e9a1125adffd6b3':
use ext4 instead of yaffs for the emulator
Ying Wang [Fri, 12 Jul 2013 18:11:56 +0000 (11:11 -0700)]
am
2476ec99: Merge "use ext4 instead of yaffs for the emulator"
* commit '
2476ec994d449d31c89571723b4b17826639c1bf':
use ext4 instead of yaffs for the emulator
Ying Wang [Fri, 12 Jul 2013 18:10:13 +0000 (18:10 +0000)]
Merge "use ext4 instead of yaffs for the emulator"
The Android Automerger [Fri, 12 Jul 2013 17:53:23 +0000 (10:53 -0700)]
"JSS11E"
JP Abgrall [Fri, 12 Jul 2013 17:08:09 +0000 (17:08 +0000)]
Merge "core: don't hardcode "out" during findleaves.py invocations."
The Android Open Source Project [Fri, 12 Jul 2013 14:30:00 +0000 (07:30 -0700)]
am
76be17de: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
76be17de7a7fc811da0145252855802d06d55367':
"JSS11D"
JSS11C
"JSS11B"
The Android Open Source Project [Fri, 12 Jul 2013 14:27:32 +0000 (07:27 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I5f92acba878b1d0f149df1499cc09f3cda23f7e3
Nick Kralevich [Wed, 10 Jul 2013 01:04:51 +0000 (18:04 -0700)]
use ext4 instead of yaffs for the emulator
Bug: https://code.google.com/p/android/issues/detail?id=38561
Change-Id: I7c605457b485d169654263caf55eb7d5a9a60c2e
The Android Automerger [Fri, 12 Jul 2013 03:26:53 +0000 (20:26 -0700)]
"JSS11D"
JP Abgrall [Fri, 12 Jul 2013 02:08:06 +0000 (19:08 -0700)]
core: don't hardcode "out" during findleaves.py invocations.
"out" can be $OUT_DIR
Bug:
7183057
Change-Id: I7b52d40de4398f481e47f6d6d719fb550d874f73
Ying Wang [Fri, 12 Jul 2013 02:01:44 +0000 (19:01 -0700)]
am
032ad054: am
a1b948af: am
cbeb6e81: Merge "Include ping6 in all device builds"
* commit '
032ad0542b395d1277b634b1243f36ae2100eb16':
Include ping6 in all device builds
Ying Wang [Fri, 12 Jul 2013 01:56:02 +0000 (18:56 -0700)]
am
a1b948af: am
cbeb6e81: Merge "Include ping6 in all device builds"
* commit '
a1b948afdb5a46e168cf59ea4045b63722ee8b47':
Include ping6 in all device builds
Ying Wang [Fri, 12 Jul 2013 01:52:19 +0000 (18:52 -0700)]
am
cbeb6e81: Merge "Include ping6 in all device builds"
* commit '
cbeb6e81fe8faaa1c138ebe213d2b6e7fb0ad251':
Include ping6 in all device builds
The Android Automerger [Fri, 12 Jul 2013 01:41:43 +0000 (18:41 -0700)]
JSS11C
The Android Automerger [Fri, 12 Jul 2013 00:12:16 +0000 (17:12 -0700)]
"JSS11B"
Ying Wang [Thu, 11 Jul 2013 19:08:48 +0000 (19:08 +0000)]
Merge "Include ping6 in all device builds"
The Android Open Source Project [Thu, 11 Jul 2013 18:49:43 +0000 (11:49 -0700)]
am
d8d0c17e: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
d8d0c17e22f42597497e8f9f5c134621e399e22a':
"JSS11"
"JWR66V"
The Android Open Source Project [Thu, 11 Jul 2013 17:17:26 +0000 (10:17 -0700)]
am
7c8042a3: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
7c8042a39858bc42e3eb5ede616acbee7e8a3f06':
"JSS10"
The Android Open Source Project [Thu, 11 Jul 2013 17:17:05 +0000 (10:17 -0700)]
am
4d9f13dd: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
4d9f13dd0fcefad9ce2e27f3b48bc0e4ba3fb9b1':
"JSS09B"
JWR66U
Jeff Brown [Thu, 11 Jul 2013 17:17:00 +0000 (10:17 -0700)]
am
9d80f708: am
a3d60ae8: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
* commit '
9d80f7085707abd8f088c4f0c4d66cd666a6feb0':
Revert "Remove mediarouter v7 support library from SDK."
The Android Open Source Project [Thu, 11 Jul 2013 15:22:27 +0000 (08:22 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I5a556ab5d8ad80eb8bbff59784ea6bd1c23f7448
The Android Open Source Project [Thu, 11 Jul 2013 15:08:03 +0000 (08:08 -0700)]
am
93351ede: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
93351edefa033cade3c8f06729a1b2a73f70e18b':
"JSS09"
The Android Automerger [Thu, 11 Jul 2013 12:56:15 +0000 (05:56 -0700)]
"JSS11"
The Android Automerger [Thu, 11 Jul 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Lorenzo Colitti [Thu, 11 Jul 2013 03:54:05 +0000 (12:54 +0900)]
Include ping6 in all device builds
ping6 is currently only included in debug builds. Include it
everywhere, now that it doesn't need to be setuid any more.
Bug:
9469682
Change-Id: Ia78f6b0e5fc8f7042fb99cdb4a0add426bb56c7e
The Android Automerger [Thu, 11 Jul 2013 01:34:56 +0000 (18:34 -0700)]
"JWR66V"
Ying Wang [Thu, 11 Jul 2013 01:23:29 +0000 (01:23 +0000)]
Merge "Bring in runtime-specific product variables in a more general way."
Ying Wang [Thu, 11 Jul 2013 01:12:33 +0000 (18:12 -0700)]
Bring in runtime-specific product variables in a more general way.
Change-Id: Ibd0e0e8e3e0ca6afd125db8035ce08a7399b7547
Ying Wang [Wed, 10 Jul 2013 23:58:52 +0000 (16:58 -0700)]
Demultiplex the coretests description rules
Previously for each target generate-core-test-description will be called
6 times that end in 6x6 calls of the function.
That's unnecessary and unsafe.
Change-Id: I03eef89b61c552b5f47f0a478feb9687fd9717da
Ying Wang [Wed, 10 Jul 2013 20:10:51 +0000 (20:10 +0000)]
Merge "Clean up files' dependencies on phony targets."
Brian Carlstrom [Wed, 10 Jul 2013 19:43:07 +0000 (12:43 -0700)]
Disable ART runtime for darwin
Change-Id: Icdad4f422bacc3f997f585df48cc6f1c2d7c7642
Ying Wang [Wed, 10 Jul 2013 18:33:27 +0000 (11:33 -0700)]
Clean up files' dependencies on phony targets.
Module names are phony targets, which make always sees as obsolete,
so a nothing-to-do build won't do nothing.
Also file target $(DEFAULT_TEST_PLAN) was never created in its rule.
Here it's fixed with a stamp file.
Bug:
9761012
Change-Id: Ic82df70cc22643d902017b5bec1022404d9bbfce
Brian Carlstrom [Wed, 10 Jul 2013 17:32:00 +0000 (10:32 -0700)]
Add ART runtime to userdebug and eng builds to allow dual booting via developer options
Change-Id: Id3f2ffe92ca083853bd28f155a314612e8b1b2f6
Brian Carlstrom [Sun, 30 Jun 2013 20:18:13 +0000 (13:18 -0700)]
Renaming dalvik.vm.lib to persist.sys.dalvik.vm.lib
Change-Id: I84ecdd1250ce7b4a367f9e07c1d198ef9a7cf066
The Android Open Source Project [Wed, 10 Jul 2013 15:34:29 +0000 (08:34 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Iab96df1946b1b94645b5e9f99a5bb37178987944
The Android Automerger [Wed, 10 Jul 2013 12:56:05 +0000 (05:56 -0700)]
"JSS10"
The Android Automerger [Wed, 10 Jul 2013 12:55:07 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Wed, 10 Jul 2013 00:13:04 +0000 (17:13 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Iefcd2a29c958299abc4cdfd7217f6f3deb7d483e
Jeff Brown [Tue, 9 Jul 2013 23:48:17 +0000 (16:48 -0700)]
am
a3d60ae8: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
* commit '
a3d60ae86f112388c27b4a164f269efd5f6d1c72':
Revert "Remove mediarouter v7 support library from SDK."
Jeff Brown [Tue, 9 Jul 2013 23:44:40 +0000 (23:44 +0000)]
Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
The Android Automerger [Tue, 9 Jul 2013 23:38:30 +0000 (16:38 -0700)]
"JSS09B"
The Android Automerger [Tue, 9 Jul 2013 23:27:09 +0000 (16:27 -0700)]
JWR66U
The Android Open Source Project [Tue, 9 Jul 2013 16:36:30 +0000 (09:36 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I9fe682604981ae07715422637fc4629d7e09937f
The Android Automerger [Tue, 9 Jul 2013 12:56:31 +0000 (05:56 -0700)]
"JSS09"
The Android Automerger [Tue, 9 Jul 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Dirk Dougherty [Tue, 9 Jul 2013 00:42:22 +0000 (17:42 -0700)]
am
ae3be8a5: am
8c01be68: am
ccc15faf: am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
ae3be8a5f4df872a149cbfc537e315cbb6bc592b':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:37:50 +0000 (17:37 -0700)]
am
8c01be68: am
ccc15faf: am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
8c01be686cacb593677dd1a753c132e58aa87661':
Doc change: Move butterbar css to template assets.
Jeff Brown [Tue, 9 Jul 2013 00:35:00 +0000 (00:35 +0000)]
Revert "Remove mediarouter v7 support library from SDK."
This reverts commit
0eacd936b7d6dabd380ecd6f1d25d39625b37495.
Bug:
9425325
Change-Id: Idf81e6721fb4361a38ffd73d39c574c2cb2b1155
Dirk Dougherty [Tue, 9 Jul 2013 00:33:58 +0000 (17:33 -0700)]
am
ccc15faf: am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
ccc15faf56ad46f973800cb6bd41b4634b9192a0':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:32:03 +0000 (17:32 -0700)]
am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
56811475202ededf0c76bf9b28d3e27d5761d747':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:29:54 +0000 (17:29 -0700)]
am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
5386532e03bbc76bcdf8a76877ef460bfe764925':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:28:40 +0000 (00:28 +0000)]
Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
Dirk Dougherty [Mon, 8 Jul 2013 23:05:05 +0000 (16:05 -0700)]
Doc change: Move butterbar css to template assets.
Change-Id: Ifa116fe304150c7c663b8088e00349ffdc69017c
Scott Main [Mon, 8 Jul 2013 22:33:42 +0000 (15:33 -0700)]
am
c9e0fac8: am
7672ccb3: am
fb2bb3d8: am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
c9e0fac8dcc25ec84b285042af9156c6660002ae':
enable download box style for qv sidebox
The Android Open Source Project [Mon, 8 Jul 2013 22:33:42 +0000 (15:33 -0700)]
am
7e1b93cb: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
7e1b93cbd5b647db496cc587c90a012af0529dff':
"JSS08"
Scott Main [Mon, 8 Jul 2013 22:32:53 +0000 (15:32 -0700)]
am
7672ccb3: am
fb2bb3d8: am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
7672ccb3d7ae6153c86bdd69a48db7e87e445c27':
enable download box style for qv sidebox
The Android Open Source Project [Mon, 8 Jul 2013 22:31:01 +0000 (15:31 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ifa6e38073ef648695efea3b895ef1fb64d39471e
Scott Main [Mon, 8 Jul 2013 22:28:53 +0000 (15:28 -0700)]
am
fb2bb3d8: am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
fb2bb3d867fcdd3add7e30d1cbb6b956d3fce89e':
enable download box style for qv sidebox
Scott Main [Mon, 8 Jul 2013 22:27:50 +0000 (15:27 -0700)]
am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
51852a3fc1120fdad1f309613439e9b42e497318':
enable download box style for qv sidebox
Scott Main [Mon, 8 Jul 2013 22:25:55 +0000 (15:25 -0700)]
am
8c0f5b3a: enable download box style for qv sidebox
* commit '
8c0f5b3aefac3c824155cf883e61b021a6d8fd8f':
enable download box style for qv sidebox
Scott Main [Mon, 8 Jul 2013 22:12:02 +0000 (15:12 -0700)]
enable download box style for qv sidebox
Change-Id: I209e9971d886e45498aab0b4d43241ded5285f24
Lorenzo Colitti [Mon, 8 Jul 2013 21:33:12 +0000 (14:33 -0700)]
am
a6e97a31: am
b1b758f5: Don\'t build clatd without clatd.conf.
* commit '
a6e97a31df26b3e9062e9ab5342e8fd6070ffb0b':
Don't build clatd without clatd.conf.
Lorenzo Colitti [Mon, 8 Jul 2013 21:31:05 +0000 (14:31 -0700)]
am
b1b758f5: Don\'t build clatd without clatd.conf.
* commit '
b1b758f5bf30d1c6f5b0c0d5599bbe6a91d541f9':
Don't build clatd without clatd.conf.
Lorenzo Colitti [Mon, 8 Jul 2013 10:43:42 +0000 (19:43 +0900)]
Don't build clatd without clatd.conf.
Bug:
9730936
Change-Id: I2c50422c7b502d5b9bdc01afb55d25353f6c7088
The Android Automerger [Mon, 8 Jul 2013 12:56:31 +0000 (05:56 -0700)]
"JSS08"
The Android Automerger [Mon, 8 Jul 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
OSDN Git Service
