tree cde76cb60763cc64dee3c02ba7005e35bfb08da4
parent 24859ba016f740c16113e04271ebe6b3eb61a241
parent 0e12fa12cb2cd4e049e560bdad8f1cd654825f3b
author Chris Craik <ccraik@google.com> 1415918780 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415918782 +0000

Merge "Add offset method to Outline" into lmp-mr1-dev