commit e5eac3d8fee655d9e36a91edc3ffa19806875bfb
author Xin Li <delphij@google.com> Thu Jul 21 23:25:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 21 23:25:03 2016 +0000
tree 7f49e4bc77afaf6d4de54a0cce83635ccd7ffcda
parent d3c96cea7725faa318bfae9d2054a30b7db24333
parent 4921295f38dbc47bf2a4db5c90bdb30a046c438a

Merge \\\"Update instructions for merging upstream changes.\\\" am: 17f8bff8b0 am: 783c166ae6
am: 4921295f38

Change-Id: I8473ce47313fda348bd730450c2da8ace7f0e11f

Android.mk

diff --git a/Android.mk b/Android.mk
index 07c7b37..f35448f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,9 +20,7 @@
 # To update:
 #
 
-#  git remote add libxml2 git://git.gnome.org/libxml2
-#  git fetch libxml2
-#  git merge libxml2/master
+#  git merge aosp/upstream-master
 #  mm -j32
 #  # (Make any necessary Android.mk changes and test the new libxml2.)
 #  git push aosp HEAD:master  # Push directly, avoiding gerrit.