| commit | 7cb5f9699b13c0079e0aac01c9535b56ecb5daf4 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Sat Jun 14 09:44:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 14 09:44:21 2014 +0000 |
| tree | d6174e2a9b3973bc68f7c03747291591ed3912a1 | |
| parent | 6e3a1c2bb27efeb717921a30c309066636a11b50 [diff] | |
| parent | 7f8d94f4117021531a388cf2b382ec66d77a3c99 [diff] |
am 7f8d94f4: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp * commit '7f8d94f4117021531a388cf2b382ec66d77a3c99': docs: squashed commit of i.o launches