Jack Palevich 28815d24c9 resolved conflicts for merge of 3945e1 to master

2009-06-10 15:09:22 -07:00

..

jni

AI 144124: Avoid leaking a pty file descriptor when quitting the terminal.

2009-04-02 10:04:28 -07:00

res

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00

src/com/android/term

resolved conflicts for merge of 3945e1 to master

2009-06-10 15:09:22 -07:00

Android.mk

AI 144089: Make "Term" build against the public Android API.

2009-04-02 09:22:07 -07:00

AndroidManifest.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00