summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-05 13:47:39 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-05 13:47:39 -0700
commitf8e0169b78994bb6f251b5bd3c2ec000b52c8149 (patch)
tree0e8c560a4a5b70556e75936dee5205e49f0ddef0 /tools
parent092578c8c162f25b962980c02ed7a42ecacd3005 (diff)
parent06d96020c35dac2bf1651cb8bd4cfced911f1142 (diff)
downloadframeworks_base-f8e0169b78994bb6f251b5bd3c2ec000b52c8149.zip
frameworks_base-f8e0169b78994bb6f251b5bd3c2ec000b52c8149.tar.gz
frameworks_base-f8e0169b78994bb6f251b5bd3c2ec000b52c8149.tar.bz2
am 06d9602: Merge change 1000 into donut
Merge commit '06d96020c35dac2bf1651cb8bd4cfced911f1142' * commit '06d96020c35dac2bf1651cb8bd4cfced911f1142': Ignore layout bin directories in git.
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/.gitignore3
-rw-r--r--tools/layoutlib/bridge/.gitignore1
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/layoutlib/.gitignore b/tools/layoutlib/.gitignore
new file mode 100644
index 0000000..d44a17d
--- /dev/null
+++ b/tools/layoutlib/.gitignore
@@ -0,0 +1,3 @@
+api/bin
+bridge/bin
+create/bin
diff --git a/tools/layoutlib/bridge/.gitignore b/tools/layoutlib/bridge/.gitignore
deleted file mode 100644
index efa6632..0000000
--- a/tools/layoutlib/bridge/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin/* \ No newline at end of file