| commit | a9bf79464cdde68bcd73023423743e9c935a31f4 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Sat Oct 25 19:53:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 25 19:53:33 2014 +0000 |
| tree | 631f292f06f13d22620bfd68f94ab1e55b717cf4 | |
| parent | af09226b381e8d5abf1cda0223229f81029e85c9 [diff] | |
| parent | 85e87c555a98bb327219b2bd3a34e4e6a2137cfe [diff] |
am 85e87c55: am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev * commit '85e87c555a98bb327219b2bd3a34e4e6a2137cfe':