commit | 7ca6e1a117687daa3abe9254d1a50a461552805f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 30 12:50:01 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:50:01 2014 +0000 |
tree | d9e4709bf5a105cf998c51d77ef1cff6a304b32f | |
parent | cb0e7bed473de93fc272423e951d40bae00c446a [diff] | |
parent | 06b2ddd6545ac11b637ce372894dbd965e81e35b [diff] |
am 06b2ddd6: am 35cd79c4: Merge commit \'8322a8739996652d56cc2ac3d867c0766715d6f7\' into HEAD * commit '06b2ddd6545ac11b637ce372894dbd965e81e35b':