tree bf70a72fa92b3a71504831386d0adecfcf760097
parent c55214a95caf1ebd9fe37a328f7e8d36efcde7bd
parent 4455da985d4bc8b3dce8ae35deaef41049d121da
author Dan Sandler <dsandler@android.com> 1411040057 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1411040058 +0000

Merge "Living with the LLand." into lmp-dev