| commit | b3ce0ec59179108b99895b30d634b4a64cb12cc9 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 12:50:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:22 2014 +0000 |
| tree | fbcc904dd5b5e9eb33300074fde787b7892a940d | |
| parent | a764361d865a0417241e6eb681dbe90fc708fc1b [diff] | |
| parent | 54c2c65e4ea1d9ee134eb71703e5ce7860b6875e [diff] |
am 54c2c65e: am a53cb80b: Merge commit \'f7d19f946f83684a894a797ebb531d647b0730c3\' into HEAD * commit '54c2c65e4ea1d9ee134eb71703e5ce7860b6875e':