| commit | 8a1b5d563135f1f93ebcce9249fc4e075548b94a | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Tue Sep 16 11:34:04 2014 -0700 |
| committer | Trevor Johns <trevorjohns@google.com> | Tue Sep 16 11:34:04 2014 -0700 |
| tree | ebb728ae7df3544b8b95bca5469441d3a8ed0bf1 | |
| parent | 3ac410ecf1d01f0d1282e86e7c43a493b4d515d2 [diff] | |
| parent | 1b6f4fd1a5ad27cda048471e5c4cd4cb163a327f [diff] |
Merge branch 'klp-modular-docs' into lmp-preview-dev Conflicts: background/alarms/RepeatingAlarm/RepeatingAlarmSample/build.gradle build.gradle ui/window/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle wearable/wear/SynchronizedNotifications/Wearable/build.gradle Change-Id: I2f57ada905c188dd8692c69a64a3385b6579d168