Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev

author Adam Powell <adamp@google.com>

Thu, 9 Oct 2014 20:08:40 +0000 (20:08 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 9 Oct 2014 20:08:41 +0000 (20:08 +0000)
author Adam Powell <adamp@google.com>
Thu, 9 Oct 2014 20:08:40 +0000 (20:08 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 9 Oct 2014 20:08:41 +0000 (20:08 +0000)
diff --cc core/java/android/view/ViewGroup.java
Simple merge
author	Adam Powell <adamp@google.com>
	Thu, 9 Oct 2014 20:08:40 +0000 (20:08 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 9 Oct 2014 20:08:41 +0000 (20:08 +0000)