OSDN Git Service
Alan Viverette [Wed, 7 Oct 2015 16:27:26 +0000 (16:27 +0000)]
Merge "Remove hard-coded DrawSelectorOnTop on ListFragment's default ListView."
Alan Viverette [Wed, 7 Oct 2015 16:23:36 +0000 (16:23 +0000)]
Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"
Alan Viverette [Wed, 7 Oct 2015 16:22:36 +0000 (16:22 +0000)]
Merge "To call TypedArray.recycle() when we are done with the array."
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:33:38 +0000 (23:33 +0000)]
am
46b51097: Merge "Safely handle interrupts during Thread.join()"
* commit '
46b51097b92900866ac5b25762f622d3ceb1be5d':
Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:27:10 +0000 (23:27 +0000)]
Merge "Safely handle interrupts during Thread.join()"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 23:38:08 +0000 (16:38 -0700)]
Safely handle interrupts during Thread.join()
Interrupt current thread if InterruptedException is received during
Thread.join(). Also, log the interruption.
Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
Stephen Hines [Sat, 3 Oct 2015 00:34:05 +0000 (17:34 -0700)]
resolved conflicts for
bd57dac5 to stage-aosp-master
Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
Chris Craik [Fri, 2 Oct 2015 22:30:09 +0000 (22:30 +0000)]
Merge "Don't unregister Fonts from renderer at destruction"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 22:08:11 +0000 (22:08 +0000)]
am
ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
* commit '
ca3e5aeaa65ae1d77ce92f082ab789933eb18237':
Retry if interrupted before mMessageThread has joined
Pirama Arumuga Nainar [Fri, 2 Oct 2015 21:58:50 +0000 (21:58 +0000)]
Merge "Retry if interrupted before mMessageThread has joined"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 19:06:10 +0000 (12:06 -0700)]
Retry if interrupted before mMessageThread has joined
Bug:
24342101
If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing. Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.
Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
Chris Craik [Fri, 2 Oct 2015 21:19:39 +0000 (14:19 -0700)]
Don't unregister Fonts from renderer at destruction
bug:
24584749
Fonts are only destroyed when the renderer is destroyed, this prevents
modifying the FontRenderer's LruCache while it's being iterated through
in FontRenderer::~FontRenderer.
Change-Id: I0e2c9f87981bfa50454ec8689df05851839e288e
Sergio Giro [Thu, 1 Oct 2015 10:16:44 +0000 (10:16 +0000)]
am
86e67d70: Merge "frameworks/base: delete TinyHashMap"
* commit '
86e67d708d738807c843850a3b6c9170e514ff8f':
frameworks/base: delete TinyHashMap
Sergio Giro [Thu, 1 Oct 2015 10:10:10 +0000 (10:10 +0000)]
Merge "frameworks/base: delete TinyHashMap"
Miao Wang [Wed, 30 Sep 2015 23:44:22 +0000 (23:44 +0000)]
am
134c504a: Merge "[RenderScript] pass correct length of ains to BLAS functions"
* commit '
134c504a3ea687a0ea875057792e66705ddbfce7':
[RenderScript] pass correct length of ains to BLAS functions
Miao Wang [Wed, 30 Sep 2015 22:53:18 +0000 (22:53 +0000)]
Merge "[RenderScript] pass correct length of ains to BLAS functions"
Miao Wang [Wed, 30 Sep 2015 22:38:07 +0000 (15:38 -0700)]
[RenderScript] pass correct length of ains to BLAS functions
bug:
24540091
Change-Id: Ia541bcbee07125c4caf3e0f4863702a3c0b929d5
Daniel Erat [Wed, 30 Sep 2015 21:30:31 +0000 (21:30 +0000)]
am
c3f37589: Merge "Update instructions in IPowerManager.aidl."
* commit '
c3f37589e04a52c109c63f6411db444500d4f92c':
Update instructions in IPowerManager.aidl.
Daniel Erat [Wed, 30 Sep 2015 21:21:33 +0000 (21:21 +0000)]
Merge "Update instructions in IPowerManager.aidl."
Daniel Erat [Wed, 30 Sep 2015 20:55:35 +0000 (14:55 -0600)]
Update instructions in IPowerManager.aidl.
Clarify IPowerManager.aidl's instructions for keeping the
C++ implementation in sync.
Change-Id: Ic51a3844483031e71fe2cfa1d3e8a065df86d119
Sene Gales [Wed, 30 Sep 2015 13:41:29 +0000 (14:41 +0100)]
frameworks/base: delete TinyHashMap
In DeferredDisplayList use std::unordered_map instead of TinyHashMap
Towards deprecation of BasicHashTable
Change-Id: I91b8d5dc80444c88fecff9c362fa610cca253973
Neil Fuller [Wed, 30 Sep 2015 13:54:53 +0000 (13:54 +0000)]
am
ead371de: Merge "Remove use of \'_\' variable name"
* commit '
ead371ded06fcf14b7af86a92100b0c3c92fd320':
Remove use of '_' variable name
Neil Fuller [Wed, 30 Sep 2015 13:48:16 +0000 (13:48 +0000)]
Merge "Remove use of '_' variable name"
Baligh Uddin [Tue, 29 Sep 2015 14:47:24 +0000 (14:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:47:22 +0000 (14:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:40:57 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:40:41 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:40:29 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:39:29 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:39:25 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:39:23 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:39:20 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:39:16 +0000 (14:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:38:48 +0000 (14:38 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 14:38:16 +0000 (14:38 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Neil Fuller [Tue, 29 Sep 2015 14:22:40 +0000 (15:22 +0100)]
Remove use of '_' variable name
'_' may become invalid in future versions of the Java language
and generates warnings in OpenJDK 8.
Bug:
24494019
Change-Id: Id77c8f003b0fdf295191d2d8dbd5b0b0edde2b44
Baligh Uddin [Tue, 29 Sep 2015 14:16:23 +0000 (14:16 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Tue, 29 Sep 2015 10:13:09 +0000 (03:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I183c668c3c25901599a969206c5b8e0026ae3d4c
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 10:09:05 +0000 (03:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46139a756e32aa01a2e2a1e707d313a309dc7ed0
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:57:43 +0000 (01:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I26c007f30d5540638e8519f09051088d55b7dcd7
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:55:45 +0000 (01:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b78a94809c16f73faaf44c1998e08165ff2014e
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:46:59 +0000 (01:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibc1f9d45ae3e029f0a2e7801f1c754c0d81a911b
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:45:05 +0000 (01:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I99d39e62622079d2e0dcfd2b739aded1ef286352
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:42:59 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3486557152d39d80058d08ce50ae4eb09764a009
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:37:52 +0000 (01:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2cdd44b0019090f2f4dbe355901e8ad8ffef626e
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:35:38 +0000 (01:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia575dec5643f0e64e9c95ac8a9e9d0ef717b6c46
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:33:36 +0000 (01:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I55491102910a9032fe4bfaec05916a2e627c7b86
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:31:39 +0000 (01:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4792c6e15e22c63197f7c73ea05db41ce896f561
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:29:36 +0000 (01:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I72e15159d79d575b98af928b6d79b5ecd2cf03d1
Auto-generated-cl: translation import
Baligh Uddin [Tue, 29 Sep 2015 08:27:34 +0000 (01:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7de2baf9bc397126186b682cd5893629d4a8a33b
Auto-generated-cl: translation import
Dan Willemsen [Mon, 28 Sep 2015 21:23:57 +0000 (21:23 +0000)]
am
899110f3: Merge "Add exported include dir for libandroid_runtime"
* commit '
899110f3012eb9ab2056d8ee182d5bdab0ecae19':
Add exported include dir for libandroid_runtime
Dan Willemsen [Mon, 28 Sep 2015 21:14:42 +0000 (21:14 +0000)]
Merge "Add exported include dir for libandroid_runtime"
Dimitry Ivanov [Mon, 28 Sep 2015 18:23:56 +0000 (18:23 +0000)]
am
66f5affb: Merge "Fix bug number for linker related workarounds"
* commit '
66f5affbe41a49bedf35e73b7c7f482db6e2fa7b':
Fix bug number for linker related workarounds
Todd Kennedy [Mon, 28 Sep 2015 18:20:38 +0000 (11:20 -0700)]
resolved conflicts for
4ed21bf0 to stage-aosp-master
Change-Id: I9c8ab83589ee3786c884f34066c1f3d709dc5136
Dimitry Ivanov [Mon, 28 Sep 2015 18:07:40 +0000 (18:07 +0000)]
Merge "Fix bug number for linker related workarounds"
Todd Kennedy [Mon, 28 Sep 2015 17:47:01 +0000 (17:47 +0000)]
Merge "Allow using the JIT"
Dmitriy Ivanov [Mon, 28 Sep 2015 17:37:49 +0000 (10:37 -0700)]
Fix bug number for linker related workarounds
Bug: http:/b/
24425865
Change-Id: Iba52acc99c8ff548ff875726988600ed230c988e
Todd Kennedy [Fri, 25 Sep 2015 21:47:15 +0000 (14:47 -0700)]
Allow using the JIT
Instead of the JIT only being available for eng builds [or configurable
via environment variable], allow the JIT to be enabled programatically.
Change-Id: Ifcbc8445fb8bd45ce2bfed3f80fbaf48496f8e3a
Todd Kennedy [Fri, 25 Sep 2015 22:06:49 +0000 (15:06 -0700)]
resolved conflicts for
7de7e0b0 to stage-aosp-master
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
Todd Kennedy [Fri, 25 Sep 2015 21:41:39 +0000 (21:41 +0000)]
Merge "Pass dexopt flags as integer"
Dan Willemsen [Fri, 25 Sep 2015 03:45:35 +0000 (20:45 -0700)]
Add exported include dir for libandroid_runtime
The libnativehelper global include dir is being removed.
Bug:
18903857
Change-Id: I6f1bed76372ccedbe7feb4d215ba8c1c0fc0a87f
Todd Kennedy [Fri, 25 Sep 2015 14:46:12 +0000 (07:46 -0700)]
Pass dexopt flags as integer
Instead of using a series of booleans, create a single flags integer
that contains all of the dexopt options.
Change-Id: Ia8fa968f64b164267f43dd29cea9dc0413058125
Todd Kennedy [Thu, 24 Sep 2015 21:34:06 +0000 (14:34 -0700)]
resolved conflicts for
cafacef6 to stage-aosp-master
Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9
Todd Kennedy [Thu, 24 Sep 2015 20:35:09 +0000 (20:35 +0000)]
Merge "Frameworks/base: Propagate boot status to installd"
Andreas Gampe [Mon, 21 Sep 2015 20:20:07 +0000 (13:20 -0700)]
Frameworks/base: Propagate boot status to installd
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.
Bug:
23898216
(cherry picked from commit
06bb908b78e3c790d3db52fef9f2ab0a129e53cd)
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
Jeff Hao [Thu, 24 Sep 2015 17:39:34 +0000 (17:39 +0000)]
am
384d84f4: Merge "Shorten first boot time by filtering dexopted apps by LRU."
* commit '
384d84f4f02643b63335f6d8d884adc1186d6896':
Shorten first boot time by filtering dexopted apps by LRU.
Jeff Hao [Thu, 24 Sep 2015 17:30:25 +0000 (17:30 +0000)]
Merge "Shorten first boot time by filtering dexopted apps by LRU."
Jeff Hao [Wed, 23 Sep 2015 20:57:30 +0000 (13:57 -0700)]
Shorten first boot time by filtering dexopted apps by LRU.
No longer dexopt all system apps and boot listener user apps.
Bug:
23628238
Bug: https://code.google.com/p/android/issues/detail?id=186589
Change-Id: Ib4f960686afcfda13838f7783c2d3ccf8e26db72
Elliott Hughes [Thu, 24 Sep 2015 17:01:32 +0000 (10:01 -0700)]
resolved conflicts for
a884d81e to stage-aosp-master
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
Elliott Hughes [Thu, 24 Sep 2015 16:01:15 +0000 (16:01 +0000)]
Merge "constify JNINativeMethod function pointer tables"
Daniel Micay [Sat, 19 Sep 2015 21:31:01 +0000 (17:31 -0400)]
constify JNINativeMethod function pointer tables
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
Elliott Hughes [Tue, 22 Sep 2015 15:42:36 +0000 (15:42 +0000)]
am
0361b18e: Merge "WrapperInit: remove dead execStandalone method"
* commit '
0361b18ea10aa7987dbf8c4217d5f4c7e3a4a610':
WrapperInit: remove dead execStandalone method
Elliott Hughes [Tue, 22 Sep 2015 15:34:26 +0000 (15:34 +0000)]
Merge "WrapperInit: remove dead execStandalone method"
Daniel Micay [Mon, 21 Sep 2015 22:14:56 +0000 (18:14 -0400)]
WrapperInit: remove dead execStandalone method
This became dead with the removal of support for the non-runtime-init
code path in
f48029f00a66e23d7872a00b56fbcf88528ba476.
Change-Id: Id68e0da4658e83f0d3bfd8645152165faacac5fa
Alan Viverette [Fri, 18 Sep 2015 20:11:44 +0000 (20:11 +0000)]
am
24ff6823: Merge "prevent unnecessary warning logs caused by View.toString()"
* commit '
24ff6823c411f794aceaae89b0b029fbf8ef6b29':
prevent unnecessary warning logs caused by View.toString()
Alan Viverette [Fri, 18 Sep 2015 19:59:20 +0000 (19:59 +0000)]
Merge "prevent unnecessary warning logs caused by View.toString()"
kenzyun_chen [Fri, 3 Jul 2015 06:59:39 +0000 (14:59 +0800)]
prevent unnecessary warning logs caused by View.toString()
If the id is negative, it is not from Resource.
Passing the negative value to getResourcePackageName makes AssetManager dump unnecessary warning logs.
It is reasonable not to get package/type/entry information for the negative id.
The warning logs :
W/ResourceType( 3711): No known package when getting name for resource
number 0x9b010100
Change-Id: Ic89acb4f32205ba5a2fdac61dc14b00ccf251148
Stephen Hines [Tue, 15 Sep 2015 23:09:59 +0000 (23:09 +0000)]
am
ce6b9db4: Merge "Update docs for RS object API fixes."
* commit '
ce6b9db498b67c8136a9267c2f87b432a5f22206':
Update docs for RS object API fixes.
Stephen Hines [Tue, 15 Sep 2015 21:22:09 +0000 (21:22 +0000)]
Merge "Update docs for RS object API fixes."
Christopher Wiley [Mon, 14 Sep 2015 15:54:23 +0000 (08:54 -0700)]
Add a textual hint as to where aidl has gone
Bug:
23691099
Change-Id: I3fb917b4c0e66a83c6299add02869a7088010adc
Christopher Wiley [Mon, 14 Sep 2015 14:34:50 +0000 (07:34 -0700)]
resolved conflicts for
ddf53180 to stage-aosp-master
Change-Id: I265ab876ef29dc731e6abb6f964c10f2e71324be
Christopher Wiley [Mon, 14 Sep 2015 14:11:19 +0000 (14:11 +0000)]
Merge "Remove the aidl tool"
Selim Cinek [Sat, 12 Sep 2015 01:21:49 +0000 (01:21 +0000)]
am
4140a21e: Merge "Fix scrolling of QS panel when no notification is present."
* commit '
4140a21e2ec69089de916e240fd606a3daf09896':
Fix scrolling of QS panel when no notification is present.
Selim Cinek [Sat, 12 Sep 2015 01:10:10 +0000 (01:10 +0000)]
Merge "Fix scrolling of QS panel when no notification is present."
Christopher Wiley [Fri, 11 Sep 2015 21:24:24 +0000 (14:24 -0700)]
Remove the aidl tool
This has been moved into its own repository at
//system/tools/aidl
Test: Built aosp_arm-eng from scratch.
Bug:
23691099
Change-Id: Ic45d55682b9dcafe894efe0a6317792f9c1236c6
Shawn Willden [Fri, 11 Sep 2015 15:07:42 +0000 (09:07 -0600)]
resolved conflicts for
b15e1ff5 to stage-aosp-master
Change-Id: I28a843a94855193d4b90dc9bec028eb5338eeed7
Shawn Willden [Fri, 11 Sep 2015 13:21:15 +0000 (13:21 +0000)]
Merge "Update KeymasterDefs"
Jayasri bhattacharyya [Thu, 10 Sep 2015 10:30:10 +0000 (16:00 +0530)]
Fix scrolling of QS panel when no notification is present.
After boot when status bar donot have any notification, the
overscroll is rubberbanded , changes have been done to fix
this and make the behaviour consistent with other scenarios.
In NotificationStackScrollLayout when there is no childview
present at the touch coordinate, initialization of some
variable was not done which was resulting into overscroll
being rubberbanded.
Usecase of the issue:
1. Reboot the phone.
2. Make sure that no notification is present
3. Pull the status bar.
4. Now pull the "No notifactions" view ,the overscroll
is rubberbanded
5. Get some notifications, pull the status bar and then
the notifications, the overscroll is not rubberbanded
6. Remove all the notifications, now pull the statusbar
and then pull "No notifications" view the overscroll is not
rubberbanded.
Change-Id: I06d4f0e3d6ed980744be21b9fd7ed307dca69ca3
Signed-off-by: Jayasri bhattacharyya <jayabhatt@codeaurora.org>
Brian Carlstrom [Fri, 11 Sep 2015 05:15:37 +0000 (05:15 +0000)]
am
de2ad457: Merge "Revert "Grab macros from libbase instead of duplicating""
* commit '
de2ad45784499388d09f2c2c3bcf2fa1966cf018':
Revert "Grab macros from libbase instead of duplicating"
Brian Carlstrom [Fri, 11 Sep 2015 05:09:17 +0000 (05:09 +0000)]
Merge "Revert "Grab macros from libbase instead of duplicating""
Casey Dahlin [Fri, 11 Sep 2015 02:47:54 +0000 (02:47 +0000)]
Revert "Grab macros from libbase instead of duplicating"
This reverts commit
2535cae005512494469fc5cea1fe630288ecb083.
Change-Id: I373844b6a0f429e88d6bcc1cdd5ac62325da55b3
Stephen Hines [Fri, 11 Sep 2015 02:47:16 +0000 (02:47 +0000)]
am
3460304c: Merge "Update RS docs for M-related changes."
* commit '
3460304c5c656b2cbf2b371720edff4fd662b02d':
Update RS docs for M-related changes.
Casey Dahlin [Fri, 11 Sep 2015 02:41:51 +0000 (02:41 +0000)]
am
8b25009d: Merge "Revert change to win32 isatty stub"
* commit '
8b25009d92626e7f1bb3b8fdf2774df20ec7a769':
Revert change to win32 isatty stub
Casey Dahlin [Fri, 11 Sep 2015 02:41:43 +0000 (02:41 +0000)]
am
ec4cbf4f: Merge "Grab macros from libbase instead of duplicating"
* commit '
ec4cbf4f93ddb14653c27bfd7a169e010b87286c':
Grab macros from libbase instead of duplicating
Casey Dahlin [Fri, 11 Sep 2015 02:41:35 +0000 (02:41 +0000)]
am
7e8586fc: Merge "Convert to C++ Bison output"
* commit '
7e8586fc1e40e7d860b05757882c3617df968fb8':
Convert to C++ Bison output
Stephen Hines [Fri, 11 Sep 2015 02:34:20 +0000 (02:34 +0000)]
Merge "Update RS docs for M-related changes."
Casey Dahlin [Fri, 11 Sep 2015 02:30:32 +0000 (02:30 +0000)]
Merge "Revert change to win32 isatty stub"
Casey Dahlin [Fri, 11 Sep 2015 02:30:15 +0000 (02:30 +0000)]
Merge "Grab macros from libbase instead of duplicating"
Casey Dahlin [Fri, 11 Sep 2015 02:30:10 +0000 (02:30 +0000)]
Merge "Convert to C++ Bison output"
Casey Dahlin [Fri, 11 Sep 2015 02:13:49 +0000 (19:13 -0700)]
Revert change to win32 isatty stub
This is attempting to fix build breakage caused by redefining the isatty stub
for win32.
Change-Id: I5f854934cb9d2b2981f6349045e85d9ad737aa77
Signed-off-by: Casey Dahlin <sadmac@google.com>
OSDN Git Service
